Changeset 466:71d37889bcfd

Timestamp:

07/01/11 11:27:45 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Fixed toolbar loading on Safari browser

Location:

admin/js

Files:

• _post.js (modified) (3 diffs)
• dcToolBar.js (modified) (5 diffs)

admin/js/_post.js

@@ -80 +80 @@
           var formatField = $('#post_format').get(0);
           $(formatField).change(function() {
-               $('#post_excerpt').dctoolbar('switch',$(this).val());
-               $('#post_content').dctoolbar('switch',$(this).val());
+               $('#post_excerpt').dctoolbar('switchMode',$(this).val());
+               $('#post_content').dctoolbar('switchMode',$(this).val());
           });
           
@@ -96 +96 @@
      
      // Tabs events
-     $('#edit-entry').onetabload(function() { 
+     $('#edit-entry').onetabload(function() {
           dotclear.hideLockable();
           
@@ -123 +123 @@
           
           // We load toolbar on excerpt only when it's ready
+          $('#post_content,#post_excerpt').dctoolbar('draw');
           $('#excerpt-area label').toggleWithLegend($('#excerpt-area').children().not('label'),{
-               fn: function() { $('#post_excerpt').dctoolbar('draw'); },
-               cookie: 'dcx_post_excerpt',
-               hide: $('#post_excerpt').val() == ''
-          });
-          $('#post_content').dctoolbar('draw');
+               cookie: 'dcx_post_excerpt'
+          },function() {
+               $('#post_excerpt').dctoolbar('toggle');
+          });
           
           // Replace attachment remove links by a POST form submit

admin/js/dcToolBar.js

@@ -35 +35 @@
                     }
                     var t = $(this).data('toolbar');
-
-                    tinymce.dom.show(t.getContainer());
-                    t.load();
+                    
+                    t.show();
                });
           },
@@ -46 +45 @@
                     }
                     var t = $(this).data('toolbar');
-
-                    tinymce.dom.hide(t.getContainer());
-                    t.load();
+                    
+                    t.hide();
                });
           },
@@ -57 +55 @@
                     }
                     var t = $(this).data('toolbar');
+                    
                     if (t.isHidden()) {
-                         t.show();
-                         t.load();
-                    }
-                    else {
-                         t.save();
+                         $(t.getContainer()).show();
+                         $(t.getElement()).hide();
+                    } else {
                          $(t.getContainer()).hide();
                     }
@@ -76 +73 @@
                });
           },
-          switch: function(formatter) {
+          switchMode: function(formatter) {
                return this.each(function(){
                     if ($(this).data('formatter') != formatter) {
                          var options = {};
+                         var displayed = !$(this).data('toolbar').isHidden();
                          options.formatter = formatter;
                          methods.destroy.apply($(this));
                          methods.init.apply($(this),[options]);
-                         methods.draw.apply($(this));
+                         if (displayed) {
+                              methods.draw.apply($(this));
+                         }
                     }
                });
@@ -99 +99 @@
                }
           } catch (e) {
-               $.error('Error happend on jQuery.dctoolbar: ' + e);
+               $.error('Error happened on jQuery.dctoolbar: ' + e);
           }
      };