Changeset 654

Timestamp:

04/10/10 15:04:13 (2 years ago)

Author:

mr_lundis

Message:

Fixing broken setFocusToNode implementation in browsers other than IE, and implementing it for Opera. Also added toStart option, defaults to false.

Location:

trunk/src/wymeditor

Files:

• jquery.wymeditor.explorer.js (modified) (1 diff)
• jquery.wymeditor.js (modified) (1 diff)
• jquery.wymeditor.mozilla.js (modified) (1 diff)
• jquery.wymeditor.opera.js (modified) (1 diff)
• jquery.wymeditor.safari.js (modified) (1 diff)

trunk/src/wymeditor/jquery.wymeditor.explorer.js

@@ -193 +193 @@
 };
 
-WYMeditor.WymClassExplorer.prototype.setFocusToNode = function(node) {
-    var range = this._doc.selection.createRange();
+WYMeditor.WymClassExplorer.prototype.setFocusToNode = function(node, toStart) {
+    var range = this._doc.selection.createRange();
+    toStart = toStart ? true : false;
+    
     range.moveToElementText(node);
-    range.collapse(false);
-    range.move('character',-1);
+    range.collapse(toStart);
     range.select();
     node.focus();

trunk/src/wymeditor/jquery.wymeditor.js

@@ -1270 +1270 @@
 };
 
+WYMeditor.editor.prototype.setFocusToNode = function(node, toStart) {
+    var range = this._doc.createRange(),
+        selection = this._iframe.contentWindow.getSelection();
+    toStart = toStart ? 0 : 1;
+    
+    range.selectNodeContents(node);
+    selection.addRange(range);
+    selection.collapse(node, toStart);
+    this._iframe.contentWindow.focus();
+};
+
 WYMeditor.editor.prototype.addCssRules = function(doc, aCss) {
   var styles = doc.styleSheets[0];

trunk/src/wymeditor/jquery.wymeditor.mozilla.js

@@ -249 +249 @@
 };
 
-WYMeditor.WymClassMozilla.prototype.setFocusToNode = function(node) {
-    var range = document.createRange();
-    range.selectNode(node);
-    var selected = this._iframe.contentWindow.getSelection();
-    selected.addRange(range);
-    selected.collapse(node, node.childNodes.length);
-    this._iframe.contentWindow.focus();
-};
-
 WYMeditor.WymClassMozilla.prototype.openBlockTag = function(tag, attributes)
 {

trunk/src/wymeditor/jquery.wymeditor.opera.js

@@ -118 +118 @@
   wym._selected_image = null;
 };
-
-// TODO: implement me
-WYMeditor.WymClassOpera.prototype.setFocusToNode = function(node) {
-
-};
-

trunk/src/wymeditor/jquery.wymeditor.safari.js

@@ -217 +217 @@
 };
 
-WYMeditor.WymClassSafari.prototype.setFocusToNode = function(node) {
-    var range = this._iframe.contentDocument.createRange();
-    range.selectNode(node);
-    var selected = this._iframe.contentWindow.getSelection();
-    selected.addRange(range);
-    selected.collapse(node, node.childNodes.length);
-    this._iframe.contentWindow.focus();
-};
-
 WYMeditor.WymClassSafari.prototype.openBlockTag = function(tag, attributes)
 {