Changeset 317:1997218a39ba for inc/admin/lib.dc.page.php

Timestamp:

05/25/11 17:50:34 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Improvements of dcToolBarManager object:

• Added events manager
• Improved JS scripts loading

File:

• inc/admin/lib.dc.page.php (modified) (3 diffs)

inc/admin/lib.dc.page.php

@@ -550 +550 @@
      {
           $params_wiki = array(
-               'init' => array(
+               'onInit' => array(
                     "jsToolBar.prototype.dialog_url = 'popup.php';",
                     "jsToolBar.prototype.base_url = '".html::escapeJS($GLOBALS['core']->blog->host)."';",
@@ -582 +582 @@
                     "jsToolBar.prototype.elements.post_link.title = '".html::escapeJS(__('Link to an entry'))."';"
                ),
-               'load' => array(
+               'onDraw' => array(
                     "$.data(elm,'toolbar',new jsToolBar(document.getElementById($(elm).attr('id'))));",
-                    "$(elm).data('toolbar').context = $(elm).data('context');"
-               ),
-               'draw' => array(
+                    "$(elm).data('toolbar').context = $(elm).data('context');",
                     "$(elm).data('toolbar').switchMode('wiki');"
                ),
-               'destroy' => array(
+               'onDestroy' => array(
                     "$(elm).data('toolbar').remove();"
                )
           );
           if (!$GLOBALS['core']->auth->check('media,media_admin',$GLOBALS['core']->blog->id)) {
-               $params_wiki['init'][] = "jsToolBar.prototype.elements.img_select.disabled = true;";
+               $params_wiki['onInit'][] = "jsToolBar.prototype.elements.img_select.disabled = true;";
           }
           
           $params_xhtml = array(
-               'preinit' => array(
-                    "if (!window.tinyMCE) {",
-                    "window.tinyMCEPreInit = {base : 'js/tiny_mce', suffix : '', query : ''};",
-                    "}"
+               'onPreInit' => array(
+                    "window.tinyMCEPreInit = {base : 'js/tiny_mce', suffix : '', query : ''};"
                ),
-               'init' => array(
-                    "tinyMCE.dom.Event.domLoaded = true;",
-                    "tinyMCE.settings = {};",
-                    "tinyMCE.settings.mode = 'textareas';",
-                    "tinyMCE.settings.relative_urls = false;",
-                    "tinyMCE.settings.theme = '".html::escapeJS('advanced')."';",
-                    "tinyMCE.settings.plugins = '".html::escapeJS('fullscreen,paste,searchreplace')."'; ",
-                    "tinyMCE.settings.theme_advanced_buttons1 = '".html::escapeJS('justifyleft,justifycenter,justifyright,separator,bold,italic,underline,strikethrough,sub,sup,separator,blockquote,bullist,numlist,outdent,indent,separator,undo,redo,separator,visualaid,separator,fullscreen,separator,code')."';",
-                    "tinyMCE.settings.theme_advanced_buttons2 = '".html::escapeJS('formatselect,removeformat,cleanup,seperator,cut,copy,paste,pastetext,pasteword,search,replace')."';",
-                    "tinyMCE.settings.theme_advanced_buttons3 = '".html::escapeJS('link,unlink,hr,charmap')."';",
-                    "tinyMCE.settings.theme_advanced_toolbar_location = '".html::escapeJS('top')."';",
-                    "tinyMCE.settings.theme_advanced_toolbar_align = '".html::escapeJS('left')."';",
-                    "tinyMCE.settings.theme_advanced_statusbar_location = '".html::escapeJS('bottom')."';",
-                    "tinyMCE.settings.theme_advanced_resizing = true;",
-                    "tinyMCE.settings.theme_advanced_resize_horizontal = false;",
-                    "tinyMCE.settings.entity_encoding = '".html::escapeJS('raw')."';",
-                    "tinyMCE.settings.add_unload_trigger = false;",
-                    "tinyMCE.settings.remove_linebreaks = false;",
-                    "tinyMCE.settings.paste_auto_cleanup_on_paste = true;"
+               'onInit' => array(
+                    "tinymce.dom.Event.domLoaded = true;",
+                    "tinymce.settings = {};",
+                    "tinymce.settings.mode = 'textareas';",
+                    "tinymce.settings.relative_urls = false;",
+                    "tinymce.settings.theme = '".html::escapeJS('advanced')."';",
+                    "tinymce.settings.plugins = '".html::escapeJS('fullscreen,paste,searchreplace')."'; ",
+                    "tinymce.settings.theme_advanced_buttons1 = '".html::escapeJS('justifyleft,justifycenter,justifyright,separator,bold,italic,underline,strikethrough,sub,sup,separator,blockquote,bullist,numlist,outdent,indent,separator,undo,redo,separator,visualaid,separator,fullscreen,separator,code')."';",
+                    "tinymce.settings.theme_advanced_buttons2 = '".html::escapeJS('formatselect,removeformat,cleanup,seperator,cut,copy,paste,pastetext,pasteword,search,replace')."';",
+                    "tinymce.settings.theme_advanced_buttons3 = '".html::escapeJS('link,unlink,hr,charmap')."';",
+                    "tinymce.settings.theme_advanced_toolbar_location = '".html::escapeJS('top')."';",
+                    "tinymce.settings.theme_advanced_toolbar_align = '".html::escapeJS('left')."';",
+                    "tinymce.settings.theme_advanced_statusbar_location = '".html::escapeJS('bottom')."';",
+                    "tinymce.settings.theme_advanced_resizing = true;",
+                    "tinymce.settings.theme_advanced_resize_horizontal = false;",
+                    "tinymce.settings.entity_encoding = '".html::escapeJS('raw')."';",
+                    "tinymce.settings.add_unload_trigger = false;",
+                    "tinymce.settings.remove_linebreaks = false;",
+                    "tinymce.settings.paste_auto_cleanup_on_paste = true;"
                ),
-               'load' => array(
-                    "$.data(elm,'toolbar',new tinyMCE.Editor($(elm).attr('id'),tinyMCE.settings));"
-               ),
-               'draw' => array(
+               'onDraw' => array(
+                    "$.data(elm,'toolbar',new tinymce.Editor($(elm).attr('id'),tinyMCE.settings));",
                     "$(elm).data('toolbar').render();"
                ),
-               'destroy' => array(
+               'onDestroy' => array(
                     "$(elm).data('toolbar').remove();"
                )
@@ -641 +635 @@
           "dcToolBarManager.msg.toolbar_does_not_exists = '".html::escapeJS(__('Toolbar [%s] does not exists'))."';\n".
           "dcToolBarManager.setToolBar({\n".
-               "id: 'xhtml',\n".
-               "js_urls: ['js/tiny_mce/tiny_mce.js'],\n".
-               "css_urls: [],\n".
-               "preinit: function() {".implode(' ',$params_xhtml['preinit'])."},\n".
-               "init: function() {".implode(' ',$params_xhtml['init'])."},\n".
-               "load: function(elm) {".implode(' ',$params_xhtml['load'])."},\n".
-               "draw: function(elm) {".implode(' ',$params_xhtml['draw'])."},\n".
-               "destroy: function(elm) {".implode(' ',$params_xhtml['destroy'])."}\n".
+               "id: 'tinymce',\n".
+               "mode: 'xhtml',\n".
+               "js: ['js/tiny_mce/tiny_mce.js'],\n".
+               "css: [],\n".
+               "onPreInit: function() {".implode(' ',$params_xhtml['onPreInit'])."},\n".
+               "onInit: function() {".implode(' ',$params_xhtml['onInit'])."},\n".
+               "onDraw: function(elm) {".implode(' ',$params_xhtml['onDraw'])."},\n".
+               "onDestroy: function(elm) {".implode(' ',$params_xhtml['onDestroy'])."}\n".
           "});\n".
           "dcToolBarManager.setToolBar({\n".
-               "id: 'wiki',\n".
-               "js_urls: ['js/jsToolBar/jsToolBar.js','js/jsToolBar/jsToolBar.dotclear.js'],\n".
-               "css_urls: ['style/jsToolBar/jsToolBar.css'],\n".
-               "init: function() {".implode("\n",$params_wiki['init'])."},\n".
-               "load: function(elm) {".implode(' ',$params_wiki['load'])."},\n".
-               "draw: function(elm) {".implode(' ',$params_wiki['draw'])."},\n".
-               "destroy: function(elm) {".implode(' ',$params_wiki['destroy'])."}\n".
+               "id: 'jstoolbar',\n".
+               "mode: 'wiki',\n".
+               "js: ['js/jsToolBar/jsToolBar.js','js/jsToolBar/jsToolBar.dotclear.js'],\n".
+               "css: ['style/jsToolBar/jsToolBar.css'],\n".
+               "onInit: function() {".implode("\n",$params_wiki['onInit'])."},\n".
+               "onDraw: function(elm) {".implode(' ',$params_wiki['onDraw'])."},\n".
+               "onDestroy: function(elm) {".implode(' ',$params_wiki['onDestroy'])."}\n".
           "});\n".
           "\n//]]>\n".