Changeset 677 for trunk

Timestamp:

09/02/10 17:27:34 (22 months ago)

Author:

mr_lundis

Message:

Fix for Safari/webkit linebreak bugs by parndt

File:

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

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

@@ -142 +142 @@
 
 //keydown handler, mainly used for keyboard shortcuts
-WYMeditor.WymClassSafari.prototype.keydown = function(evt) {
+WYMeditor.WymClassSafari.prototype.keydown = function(e) {
   
   //'this' is the doc
   var wym = WYMeditor.INSTANCES[this.title];
   
-  if(evt.ctrlKey){
-    if(evt.keyCode == 66){
+  if(e.ctrlKey){
+    if(e.keyCode == 66){
       //CTRL+b => STRONG
       wym._exec(WYMeditor.BOLD);
-      return false;
-    }
-    if(evt.keyCode == 73){
+      e.preventDefault();
+    }
+    if(e.keyCode == 73){
       //CTRL+i => EMPHASIS
       wym._exec(WYMeditor.ITALIC);
-      return false;
-    }
+      e.preventDefault();
+    }
+  } else if(e.shiftKey && e.keyCode == 13) {
+    wym._exec('InsertLineBreak');
+    e.preventDefault();
   }
 };
@@ -180 +183 @@
     if(container && container.tagName.toLowerCase() == WYMeditor.PRE)
         wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P); //create P after PRE
-  }
-
-  //fix #112
-  if(evt.keyCode == 13 && evt.shiftKey) {
-    wym._exec('InsertLineBreak');
   }