Changeset 676

Timestamp:

07/31/10 21:49:07 (23 months ago)

Author:

mr_lundis

Message:

Modified insert to use ranges instead of the InsertHTML command. Webkit-based browsers was acting funny.

File:

• trunk/src/wymeditor/jquery.wymeditor.js (modified) (2 diffs)

trunk/src/wymeditor/jquery.wymeditor.js

@@ -1271 +1271 @@
 WYMeditor.editor.prototype.insert = function(html) {
     // Do we have a selection?
-    if (this._iframe.contentWindow.getSelection().focusNode != null) {
+    var selection = this._iframe.contentWindow.getSelection(),
+        range,
+        node;
+    if (selection.focusNode != null) {
         // Overwrite selection with provided html
-        this._exec( WYMeditor.INSERT_HTML, html);
+        range = selection.getRangeAt(0);
+        node = range.createContextualFragment(html);
+        range.deleteContents();
+        range.insertNode(node);
     } else {
         // Fall back to the internal paste function if there's no selection
@@ -1281 +1287 @@
 
 WYMeditor.editor.prototype.wrap = function(left, right) {
-    // Do we have a selection?
-    if (this._iframe.contentWindow.getSelection().focusNode != null) {
-        // Wrap selection with provided html
-        this._exec( WYMeditor.INSERT_HTML, left + this._iframe.contentWindow.getSelection().toString() + right);
-    }
+    this.insert(left + this._iframe.contentWindow.getSelection().toString() + right);
 };
 
 WYMeditor.editor.prototype.unwrap = function() {
-    // Do we have a selection?
-    if (this._iframe.contentWindow.getSelection().focusNode != null) {
-        // Unwrap selection
-        this._exec( WYMeditor.INSERT_HTML, this._iframe.contentWindow.getSelection().toString() );
-    }
+    this.insert(this._iframe.contentWindow.getSelection().toString());
 };