Changeset 603

Timestamp:

04/21/09 22:21:44 (3 years ago)

Author:

jf.hovinne

Message:

Index is needed in the element replaced by WYMeditor, since it's not always the immediate previous element.

Location:

trunk/src

Files:

• apps/drupal/wysiwyg/editors/js/wymeditor.js (modified) (2 diffs)
• wymeditor/jquery.wymeditor.js (modified) (1 diff)

trunk/src/apps/drupal/wysiwyg/editors/js/wymeditor.js

@@ -14 +14 @@
   if (typeof params != 'undefined') {
     var $field = $('#' + params.field);
-    var instance = $field.next().data(WYMeditor.WYM_INDEX);
-    if (typeof instance != 'undefined') {
-      WYMeditor.INSTANCES[instance].update();
-      $field.next().remove();
+    var index = $field.data(WYMeditor.WYM_INDEX);
+    if (typeof index != 'undefined') {
+      var editor = WYMeditor.INSTANCES[index];
+      editor.update();
+      $(editor._box).remove();
+      delete editor;
     }
     $field.show();
@@ -24 +26 @@
     jQuery.each(WYMeditor.INSTANCES, function() {
       this.update();
-      $(this._box).prev().show().end()
-        .remove();
+      $(this._box).remove();
+      $(this._element).show();
+      delete this;
     });
   }

trunk/src/wymeditor/jquery.wymeditor.js

@@ -741 +741 @@
       this._box = jQuery(this._element).hide().after(this._options.boxHtml).next().addClass('wym_box_' + this._index);
 
-      //store the instance index in the wymbox element
+      //store the instance index in wymbox and element replaced by editor instance
       //but keep it compatible with jQuery < 1.2.3, see #122
-      if( jQuery.isFunction( jQuery.fn.data ) )
+      if( jQuery.isFunction( jQuery.fn.data ) ) {
         jQuery.data(this._box.get(0), WYMeditor.WYM_INDEX, this._index);
+        jQuery.data(this._element.get(0), WYMeditor.WYM_INDEX, this._index);
+      }
       
       var h = WYMeditor.Helper;