Merge pull request #2 from alexriss/develop

Replaced function insertSyntax

Author: micgro42

src/upload.js

@@ -246,14 +246,25 @@ jQuery(function () {
         if (!$editarea.length) {
             return;
         }
-        var syntax = '{{' + fileid + '}}';
-        var caretPos = $editarea[0].selectionStart;
-        var prefix = $editarea.text().substring(0, caretPos);
-        var postfix = $editarea.text().substring(caretPos);
-        $editarea.text(prefix + syntax + postfix);
-        var newCaretPos = caretPos+syntax.length;
-        $editarea[0].setSelectionRange(newCaretPos, newCaretPos);
-        $lastKnownCaretPosition = newCaretPos;  // IE 11 fix
+        var open = '{{' + fileid;
+        var close = '}}';
+
+        var selection = DWgetSelection($editarea[0]);
+        var text = selection.getText();
+        var opts;
+
+        // don't include trailing space in selection
+        if(text.charAt(text.length - 1) == ' '){
+            selection.end--;
+            text = selection.getText();
+        }
+
+        if(text){
+            text = '|' + text;  // use text as label
+        }
+        opts = { nosel: true };
+        text = open + text + close;
+        pasteText(selection,text,opts);
     }
 
     /**