Changeset 622

Timestamp:

05/24/09 13:11:47 (3 years ago)

Author:

jf.hovinne

Message:

Improve fix for #73, using keydown and insert, instead of keyup and exec.

File:

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

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

@@ -168 +168 @@
   //'this' is the doc
   var wym = WYMeditor.INSTANCES[this.title];
-  
+  var container = null;  
+
   if(evt.ctrlKey){
     if(evt.keyCode == 66){
@@ -181 +182 @@
     }
   }
+
+  else if(evt.keyCode == 13) {
+    if(!evt.shiftKey){
+      //fix PRE bug #73
+      container = wym.selected();
+      if(container && container.tagName.toLowerCase() == WYMeditor.PRE) {
+        evt.preventDefault();
+        wym.insert('<p></p>');
+      }
+    }
+  }
 };
 
@@ -197 +209 @@
     //cleanup <br><br> between paragraphs
     jQuery(wym._doc.body).children(WYMeditor.BR).remove();
-    
-    //fix PRE bug #73
-    container = wym.selected();
-    if(container && container.tagName.toLowerCase() == WYMeditor.PRE)
-        wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P); //create P after PRE
   }