Changes in [1824:eed1c6769645:1825:5fdad3202f9c]

Files:

• admin/js/jsToolBar/jsToolBar.dotclear.js (modified) (1 diff)
• admin/js/jsToolBar/jsToolBar.js (modified) (6 diffs)
• plugins/tags/js/post.js (modified) (1 diff)

admin/js/jsToolBar/jsToolBar.dotclear.js

@@ -377 +377 @@
 
 // Last space element
-jsToolBar.prototype.elements.space3 = {type: 'space'};
+jsToolBar.prototype.elements.space3 = {
+     type:'space', 
+     format:{
+          wysiwyg:true,
+          wiki:true,
+          xhtml:true
+     }
+};

admin/js/jsToolBar/jsToolBar.js

@@ -167 +167 @@
      space: function(toolName) {
           var tool = new jsSpace(toolName);
+          if (!this.elements[toolName].format[this.mode]) return null;
           if (this.elements[toolName].width !== undefined) {
                tool.width = this.elements[toolName].width;
@@ -174 +175 @@
      combo: function(toolName) {
           var tool = this.elements[toolName];
-          var length = tool[this.mode].list.length;
-          
-          if (typeof tool[this.mode].fn != 'function' || length == 0) {
-               return null;
-          } else {
-               var options = {};
-               for (var i=0; i < length; i++) {
-                    var opt = tool[this.mode].list[i];
-                    options[opt] = tool.options[opt];
+          
+          if( tool[this.mode] != undefined) {
+               
+               var length = tool[this.mode].list.length;
+               
+               if (typeof tool[this.mode].fn != 'function' || length == 0) {
+                    return null;
+               } else {
+                    var options = {};
+                    for (var i=0; i < length; i++) {
+                         var opt = tool[this.mode].list[i];
+                         options[opt] = tool.options[opt];
+                    }
+                    return new jsCombo(tool.title, options, this, tool[this.mode].fn);
                }
-               return new jsCombo(tool.title, options, this, tool[this.mode].fn);
-          }
+               
+          }
+          
      },
      draw: function(mode) {
@@ -347 +354 @@
 
 // spacer
-jsToolBar.prototype.elements.space0 = {type: 'space'};
+jsToolBar.prototype.elements.space0 = {
+     type:'space', 
+     format:{
+          wysiwyg:true,
+          wiki:true,
+          xhtml:true
+     }
+};
 
 // strong
@@ -410 +424 @@
 
 // spacer
-jsToolBar.prototype.elements.space1 = {type: 'space'};
+jsToolBar.prototype.elements.space1 = {
+     type:'space', 
+     format:{
+          wysiwyg:true,
+          wiki:true,
+          xhtml:true
+     }
+};
 
 // br
@@ -423 +444 @@
 
 // spacer
-jsToolBar.prototype.elements.space2 = {type: 'space'};
+jsToolBar.prototype.elements.space2 = {
+     type:'space', 
+     format:{
+          wysiwyg:true,
+          wiki:true,
+          xhtml:true
+     }
+};
 
 // blockquote
@@ -494 +522 @@
 
 // spacer
-jsToolBar.prototype.elements.space3 = {type: 'space'};
+jsToolBar.prototype.elements.space3 = {
+     type:'space', 
+     format:{
+          wysiwyg:true,
+          wiki:true,
+          xhtml:true
+     }
+};
 
 // link

plugins/tags/js/post.js

@@ -67 +67 @@
 
 // Toolbar button for tags
-jsToolBar.prototype.elements.tagSpace = {type: 'space'};
+jsToolBar.prototype.elements.tagSpace = {
+     type: 'space', 
+     format:{
+          wysiwyg:true,
+          wiki:true,
+          xhtml:true
+     }
+};
 
 jsToolBar.prototype.elements.tag = {type: 'button', title: 'Keyword', fn:{} };