Merge branch 'master' into stable

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js
index 2c0924eb7..74919cb98 100644
--- a/lib/scripts/editor.js
+++ b/lib/scripts/editor.js
@@ -134,7 +134,7 @@ var dw_editor = {
         if(jQuery.inArray(e.keyCode,[8, 13, 32]) === -1) {
             return;
         }
-        var selection = getSelection(this);
+        var selection = DWgetSelection(this);
         if(selection.getLength() > 0) {
             return; //there was text selected, keep standard behavior
         }
@@ -155,7 +155,7 @@ var dw_editor = {
                                  this.value.substr(selection.start);
                     selection.start = linestart + 1;
                     selection.end = linestart + 1;
-                    setSelection(selection);
+                    DWsetSelection(selection);
                 } else {
                     insertAtCarret(this.id,match[1]);
                 }
@@ -180,7 +180,7 @@ var dw_editor = {
                     selection.start = linestart;
                     selection.end   = linestart;
                 }
-                setSelection(selection);
+                DWsetSelection(selection);
                 e.preventDefault(); // prevent backspace
                 return false;
             }
@@ -192,7 +192,7 @@ var dw_editor = {
                              this.value.substr(linestart);
                 selection.start = selection.start + 2;
                 selection.end   = selection.start;
-                setSelection(selection);
+                DWsetSelection(selection);
                 e.preventDefault(); // prevent space
                 return false;
             }