Changeset 2939:597ca1582463

Timestamp:

01/29/15 13:45:34 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Misuses of jsToolBar object with dcCKEditor

Location:

plugins/tags

Files:

• inc/tags.behaviors.php (modified) (2 diffs)
• js/ckeditor-tags-plugin.js (modified) (2 diffs)

plugins/tags/inc/tags.behaviors.php

@@ -16 +16 @@
      public static function adminPostEditor($editor='',$context='',array $tags=array())
      {
-          if ($editor != 'dcLegacyEditor' || $context != 'post') return;
+          if (($editor != 'dcLegacyEditor' && $editor != 'dcCKEditor') || $context != 'post') return;
 
           $tag_url = $GLOBALS['core']->blog->url.$GLOBALS['core']->url->getURLFor('tag');
 
-          return
-          '<script type="text/javascript" src="index.php?pf=tags/js/legacy-post.js"></script>'.
-          '<script type="text/javascript">'."\n".
-          "//<![CDATA[\n".
-          "jsToolBar.prototype.elements.tag.title = '".html::escapeJS(__('Tag'))."';\n".
-          "jsToolBar.prototype.elements.tag.url = '".html::escapeJS($tag_url)."';\n".
-          "\n//]]>\n".
-          "</script>\n";
+          if ($editor == 'dcLegacyEditor') {
+               return
+               '<script type="text/javascript" src="index.php?pf=tags/js/legacy-post.js"></script>'.
+               '<script type="text/javascript">'."\n".
+               "//<![CDATA[\n".
+               "jsToolBar.prototype.elements.tag.title = '".html::escapeJS(__('Tag'))."';\n".
+               "jsToolBar.prototype.elements.tag.url = '".html::escapeJS($tag_url)."';\n".
+               "\n//]]>\n".
+               "</script>\n";
+          } elseif ($editor == 'dcCKEditor') {
+               return
+               '<script type="text/javascript">'."\n".
+               "//<![CDATA[\n".
+               "dotclear.msg.tag_title = '".html::escapeJS(__('Tag'))."';\n".
+               "dotclear.msg.tag_url = '".html::escapeJS($tag_url)."';\n".
+               "\n//]]>\n".
+               "</script>\n";
+          }
+          return;
      }
 
@@ -34 +45 @@
         global $core;
 
-        if ($context!='post') {
+        if ($context != 'post') {
             return;
         }

plugins/tags/js/ckeditor-tags-plugin.js

@@ -6 +6 @@
                          if (editor.getSelection().getNative().toString().replace(/\s*/,'')!='') {
                               var str = editor.getSelection().getNative().toString().replace(/\s*/,'');
-                              var url = jsToolBar.prototype.elements.tag.url;
+                              var url = dotclear.msg.tag_url;
                               window.dc_tag_editor.addMeta(str);
                               var link = '<a href="'+$.stripBaseURL(url+'/'+str)+'">'+str+'</a>';
@@ -16 +16 @@
 
                editor.ui.addButton('dcTags', {
-                    label: jsToolBar.prototype.elements.tag.title,
+                    label: dotclear.msg.tag_title,
                     command: 'dcTagsCommand',
                     toolbar: 'insert',