Changeset 1279

Timestamp:

11/18/10 10:28:35 (2 years ago)

Author:

ejucovy

Message:

whoops - my commit r1278 was wrong: it registered the buttons in the reverse order (DD - DT - DL). rather than building some complicated partial-array-reversal logic here (a full array reversal wouldn't work because of the linebreak and separator items), i'm just going to simplify the whole thing and hard-code the button registrations. I don't think anyone will mind the loss of the linebreak here..

Files:

• trunk/plugins/DefinitionList/DefinitionList.js (modified) (2 diffs)

trunk/plugins/DefinitionList/DefinitionList.js

@@ -10 +10 @@
   var self = this;
   // register the toolbar buttons provided by this plugin
-  var toolbar = ["linebreak"];
   for (var i = 0; i < bl.length; ++i) {
     var btn = bl[i];
     if (!btn) {
-      toolbar.push("separator");
-    } else {
-      var id = btn[0];
-      cfg.registerButton(id, this._lc(btn[1]), editor.imgURL("ed_" + btn[0] + ".gif", "DefinitionList"), false,
-             function(editor, id) {
-               // dispatch button press event
-               self.buttonPress(editor, id);
-             });
-      toolbar.push(id);
+      continue;
     }
+    var id = btn[0];
+    cfg.registerButton(id, this._lc(btn[1]), editor.imgURL("ed_" + btn[0] + ".gif", "DefinitionList"), false,
+      function(editor, id) {
+        // dispatch button press event
+        self.buttonPress(editor, id);
+      });
   }
 
@@ -29 +26 @@
   // If neither of those buttons exists, addToolbarElement puts our buttons
   // at the beginning of the toolbar, which is good enough.
-  for( var i = 0; i < toolbar.length; ++i ) {
-    cfg.addToolbarElement(toolbar[i], ["insertunorderedlist", "insertorderedlist"], 1);
-  }
+  cfg.addToolbarElement("dl", ["insertunorderedlist", "insertorderedlist"], 1);
+  cfg.addToolbarElement("dt", "dl", 1);
+  cfg.addToolbarElement("dd", "dt", 1);
 }