Changeset 326:3138de12835e for admin

Timestamp:

06/01/11 18:33:48 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Let's start fresh for a better world

Location:

admin

Files:

• js/_post.js (modified) (2 diffs)
• js/dcToolBar.js (added)
• js/dcToolBarManager.js (deleted)
• js/tiny_mce/plugins/dcControls/editor_plugin.js (added)
• js/tiny_mce/plugins/dcControls/img/code.png (added)
• js/tiny_mce/plugins/dcControls/img/imglink.png (added)
• js/tiny_mce/plugins/dcControls/img/medialink.png (added)
• js/tiny_mce/plugins/dcControls/img/postlink.png (added)
• js/tiny_mce/plugins/dcControls/img/quote.png (added)
• js/tiny_mce/plugins/dcControls/js/popup_link.js (added)
• js/tiny_mce/plugins/dcControls/js/popup_media.js (added)
• js/tiny_mce/plugins/dcControls/js/popup_posts.js (added)
• js/tiny_mce/tiny_mce_popup.js (added)
• media_item.php (modified) (1 diff)
• popup_link.php (modified) (1 diff)
• popup_posts.php (modified) (1 diff)

admin/js/_post.js

@@ -80 +80 @@
           var formatField = $('#post_format').get(0);
           $(formatField).change(function() {
-               $('#post_excerpt').dctoolbarmanager('switch',$(this).val());
-               $('#post_content').dctoolbarmanager('switch',$(this).val());
+               $('#post_excerpt').dctoolbar('switch',$(this).val());
+               $('#post_content').dctoolbar('switch',$(this).val());
           });
           
           // Init toolbars
-          $('#post_excerpt,#post_content').dctoolbarmanager({
-               id: 'tinymce',
-               mode: $(formatField).val(),
-               context: 'post'
-          });
+          $('#post_excerpt,#post_content').dctoolbar({formatter: $(formatField).val()});
      }
      
      if (document.getElementById('comment_content')) {
-          $('#comment_content').dctoolbarmanager({mode:'xhtml'});
+          //$('#comment_content').dctoolbar({formatter:'xhtml'});
      }
      
@@ -128 +124 @@
           // We load toolbar on excerpt only when it's ready
           $('#excerpt-area label').toggleWithLegend($('#excerpt-area').children().not('label'),{
-               fn: function() { $('#post_excerpt').dctoolbarmanager('draw'); },
+               fn: function() { $('#post_excerpt').dctoolbar('draw'); },
                cookie: 'dcx_post_excerpt',
                hide: $('#post_excerpt').val() == ''
           });
+          $('#post_content').dctoolbar('draw');
           
           // Replace attachment remove links by a POST form submit

admin/media_item.php

@@ -160 +160 @@
 if ($popup) {
      $starting_scripts .=
-     dcPage::jsLoad('js/jsToolBar/popup_media.js');
+     dcPage::jsLoad('js/tiny_mce/plugins/dcControls/js/popup_media.js');
 }
 call_user_func($open_f,__('Media manager'),

admin/popup_link.php

@@ -19 +19 @@
 $title = !empty($_GET['title']) ? $_GET['title'] : '';
 
-dcPage::openPopup(__('Add a link'),dcPage::jsLoad('js/jsToolBar/popup_link.js'));
+dcPage::openPopup(__('Add a link'),dcPage::jsLoad('js/tiny_mce/plugins/dcControls/js/popup_link.js'));
 
 echo '<h2>'.__('Add a link').'</h2>';

admin/popup_posts.php

@@ -31 +31 @@
 dcPage::openPopup(__('Add a link to an entry'),
      dcPage::jsLoad('js/_posts_list.js').
-     dcPage::jsLoad('js/jsToolBar/popup_posts.js'));
+     dcPage::jsLoad('js/tiny_mce/plugins/dcControls/js/popup_posts.js'));
 
 echo '<h2>'.__('Add a link to an entry').'</h2>';