Changeset 1117

Timestamp:

11/12/08 13:07:40 (5 years ago)

Author:

ray

Message:

* removed a console.log() call from Linker
* make icon for wysiwygmode and the one in the dialog caption iconset-able

Location:

trunk

Files:

• XinhaCore.js (modified) (3 diffs)
• modules/Dialogs/XinhaDialog.js (modified) (1 diff)
• plugins/Linker/pluginMethods.js (modified) (1 diff)

trunk/XinhaCore.js

@@ -1112 +1112 @@
    * @private
    */
-  this.iconList = {}
+  this.iconList = 
+  {
+    dialogCaption : _editor_url + 'images/xinha-small-icon.gif',
+    wysiwygmode : [_editor_url + 'images/ed_buttons_main.png',7,1]
+  }
   // initialize tooltips from the I18N module and generate correct image path
   for ( var i in this.btnList )
@@ -2275 +2279 @@
           icon = icon.getElementsByTagName('default')[0];
         }
-        path = _editor_url + getTextContent(icon.getElementsByTagName('path')[0]);
+        path = getTextContent(icon.getElementsByTagName('path')[0]);
+        path = (!/^\//.test(path) ? _editor_url : '') + path;
         type = icon.getAttribute('type');
         if (type == 'map')
@@ -3182 +3187 @@
     case "textmode":
       this.firePluginEvent('onBeforeMode', 'textmode');
-      this._toolbarObjects.htmlmode.swapImage([this.imgURL('images/ed_buttons_main.png'),7,1]); 
+      this._toolbarObjects.htmlmode.swapImage(this.config.iconList.wysiwygmode); 
       this.setCC("iframe");
       html = this.outwardHtml(this.getHTML());

trunk/modules/Dialogs/XinhaDialog.js

@@ -236 +236 @@
   {
     className = 'icon';
-    src = _editor_url + 'images/xinha-small-icon.gif';
+    src = editor.config.iconList.dialogCaption;
     style.position = 'absolute';
     style.top = '3px';

trunk/plugins/Linker/pluginMethods.js

@@ -553 +553 @@
   for (var i=0; i<enabledTargets.length; i++)
   {
-    console.log(this.dialog.getElementById(enabledTargets[i]));
-    console.log("is checked: " + this.dialog.getElementById(enabledTargets[i]).checked);
     if (this.dialog.getElementById(enabledTargets[i]).checked == true)
     {