Changeset 668

Timestamp:

06/14/10 21:06:06 (2 years ago)

Author:

mr_lundis

Message:

Ended up rewriting the paste method, still room for improvement though. Fixes #131.

File:

• trunk/src/wymeditor/jquery.wymeditor.js (modified) (1 diff)

trunk/src/wymeditor/jquery.wymeditor.js

@@ -1215 +1215 @@
 };
 
-WYMeditor.editor.prototype.paste = function(sData) {
-
-  var sTmp;
-  var container = this.selected();
-        
-  //split the data, using double newlines as the separator
-  var aP = sData.split(this._newLine + this._newLine);
-  var rExp = new RegExp(this._newLine, "g");
-
-  //add a P for each item
-  if(container && container.tagName.toLowerCase() != WYMeditor.BODY) {
-    for(x = aP.length - 1; x >= 0; x--) {
-        sTmp = aP[x];
-        //simple newlines are replaced by a break
-        sTmp = sTmp.replace(rExp, "<br />");
-        jQuery(container).after("<p>" + sTmp + "</p>");
-    }
-  } else {
-    for(x = 0; x < aP.length; x++) {
-        sTmp = aP[x];
-        //simple newlines are replaced by a break
-        sTmp = sTmp.replace(rExp, "<br />");
-        jQuery(this._doc.body).append("<p>" + sTmp + "</p>");
-    }
-  
-  }
+/* @name paste
+ * @description         Paste text into the editor below the carret,
+ *                      used for "Paste from Word".
+ * @param String str    String to insert, two or more newlines separates 
+ *                      paragraphs. May contain inline HTML.
+ */
+WYMeditor.editor.prototype.paste = function(str) {
+    var container = this.selected(),
+        html = '',
+        paragraphs,
+        focusNode;
+
+    // Split string into paragraphs by two or more newlines
+    paragraphs = str.split(new RegExp(this._newLine + '{2,}', 'g'));
+
+    // Build html
+    for (var i=0, l=paragraphs.length; i < l; i++) {
+        html += '<p>' + 
+            ( paragraphs[i].split(this._newLine).join('<br />') ) + 
+            '</p>';
+    }
+
+    // Insert where appropriate
+    if (container && container.tagName.toLowerCase() != WYMeditor.BODY) {
+        // No .last() pre jQuery 1.4
+        //focusNode = jQuery(html).insertAfter(container).last()[0];
+        paragraphs = jQuery(html, this._doc).insertAfter(container);
+        focusNode = paragraphs[paragraphs.length - 1];
+    } else {
+        paragraphs = jQuery(html, this._doc).appendTo(this._doc.body);
+        focusNode = paragraphs[paragraphs.length - 1];
+    }
+    
+    // Do some minor cleanup (#131)
+    if (jQuery(container).text() == '') {
+        jQuery(container).remove(); 
+    }
+    // And remove br (if editor was empty)
+    jQuery('body > br', this._doc).remove();
+    
+    // Restore focus
+    this.setFocusToNode(focusNode);
 };