Merge branch 'master' into stable

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index b1dbff683..c07b8f975 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -134,7 +134,10 @@ function pickerInsert(text,edid){
  */
 function addBtnActionSignature($btn, props, edid) {
     if(typeof SIG != 'undefined' && SIG != ''){
-        $btn.bind('click', bind(insertAtCarret,edid,SIG));
+        $btn.bind('click', function (e) {
+            insertAtCarret(edid,SIG);
+            e.preventDefault();
+        });
         return edid;
     }
     return '';
@@ -148,7 +151,7 @@ function addBtnActionSignature($btn, props, edid) {
 function currentHeadlineLevel(textboxId){
     var field = jQuery('#' + textboxId)[0],
         s = false,
-        opts = [field.value.substr(0,getSelection(field).start)];
+        opts = [field.value.substr(0,DWgetSelection(field).start)];
     if (field.form.prefix) {
         // we need to look in prefix context
         opts.push(field.form.prefix.value);
@@ -217,10 +220,10 @@ jQuery(function () {
         }
 
         // set focus and place cursor at the start
-        var sel = getSelection($edit_text[0]);
+        var sel = DWgetSelection($edit_text[0]);
         sel.start = 0;
         sel.end   = 0;
-        setSelection(sel);
+        DWsetSelection(sel);
         $edit_text.focus();
     }