Changeset 648

Timestamp:

01/09/10 17:07:38 (2 years ago)

Author:

mr_lundis

Message:

Modified the mouse event handling to use event delegation rather than listening to all the elements. Fixes #121 and django-cms-2.0 issue 184.  http://github.com/digi604/django-cms-2.0/issues#issue/184

Location:

trunk/src/wymeditor

Files:

• jquery.wymeditor.explorer.js (modified) (1 diff)
• jquery.wymeditor.js (modified) (2 diffs)
• 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

@@ -119 +119 @@
     break;
         }
-    
-    this.listen();
+
 };
 

trunk/src/wymeditor/jquery.wymeditor.js

@@ -940 +940 @@
       this.update();
       this.toggleHtml();
-
-      //partially fixes #121 when the user manually inserts an image
-      if(!jQuery(this._box).find(this._options.htmlSelector).is(':visible'))
-        this.listen();
     break;
     
@@ -1333 +1329 @@
 
 WYMeditor.editor.prototype.listen = function() {
-
-  //don't use jQuery.find() on the iframe body
-  //because of MSIE + jQuery + expando issue (#JQ1143)
-  //jQuery(this._doc.body).find("*").bind("mouseup", this.mouseup);
-  
-  jQuery(this._doc.body).bind("mousedown", this.mousedown);
-  var images = this._doc.body.getElementsByTagName("img");
-  for(var i=0; i < images.length; i++) {
-    jQuery(images[i]).bind("mousedown", this.mousedown);
-  }
+    //don't use jQuery.find() on the iframe body
+    //because of MSIE + jQuery + expando issue (#JQ1143)
+    //jQuery(this._doc.body).find("*").bind("mouseup", this.mouseup);
+
+    jQuery(this._doc.body).bind("mousedown", this.mousedown);
 };
 
 WYMeditor.editor.prototype.mousedown = function(evt) {
-  
-  var wym = WYMeditor.INSTANCES[this.ownerDocument.title];
-  wym._selected_image = (this.tagName.toLowerCase() == WYMeditor.IMG) ? this : null;
-  evt.stopPropagation();
+    var wym = WYMeditor.INSTANCES[this.ownerDocument.title];
+    wym._selected_image = (evt.target.tagName.toLowerCase() == WYMeditor.IMG) ? evt.target : null;
 };
 

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

@@ -137 +137 @@
     if(container.tagName.toLowerCase() == WYMeditor.BODY)
         this._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P);
-    
-    //add event handlers on doc elements
-
-    this.listen();
 };
 

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

@@ -69 +69 @@
     if(param) this._doc.execCommand(cmd,false,param);
     else this._doc.execCommand(cmd);
-    
-    this.listen();
+
 };
 

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

@@ -119 +119 @@
         this._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P);
 
-    //add event handlers on doc elements
-    this.listen();
 };