Changeset 330:251a7909b0fe for plugins/tags

Timestamp:

06/03/11 11:55:39 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Added plugin tag for TinyMCE

Location:

plugins/tags

Files:

• _admin.php (modified) (4 diffs)
• js/post.js (modified) (3 diffs)

plugins/tags/_admin.php

@@ -39 +39 @@
 
 $core->addBehavior('adminDashboardFavs',array('tagsBehaviors','dashboardFavs'));
+
+$core->addBehavior('adminToolbar',array('tagsBehaviors','adminToolbar'));
 
 # BEHAVIORS
@@ -122 +124 @@
           "dotclear.msg.entry = '".html::escapeJS(__('entry'))."';\n".
           "dotclear.msg.entries = '".html::escapeJS(__('entries'))."';\n".
-          "dcToolBarManager.bind('onInit','wiki',function() {\n".
-               "jsToolBar.prototype.elements.tag.title = '".html::escapeJS(__('Tag'))."';\n".
-               "jsToolBar.prototype.elements.tag.url = '".html::escapeJS($tag_url)."';\n".
-          "});\n".
-          "dcToolBarManager.bind('onInit','xhtml',function() {\n".
-               "tinymce.plugins.dcTag.title = '".html::escapeJS(__('Tag'))."';\n".
-               "tinymce.plugins.dcTag.url = '".html::escapeJS($tag_url)."';\n".
-          "});\n".
           "\n//]]>\n".
           "</script>\n".
@@ -137 +131 @@
      public static function postsActionsHeaders()
      {
-          $tag_url = $GLOBALS['core']->blog->url.$GLOBALS['core']->url->getBase('tag');
-          
           $opts = $GLOBALS['core']->auth->getOptions();
           $type = isset($opts['tag_list_format']) ? $opts['tag_list_format'] : 'more';
@@ -327 +319 @@
           }
      }
+     
+     public static function adminToolbar($tb)
+     {
+          $tag_url = $GLOBALS['core']->blog->getQMarkURL().$GLOBALS['core']->url->getBase('tag');
+          
+          $tb->addSettings('xhtml',array('tag_url_pattern' => $tag_url));
+          $tb->addPlugins('xhtml',array('dcTag' => false));
+          $tb->addButtons('xhtml',array(3 => array('tag')));
+     }
 }
 ?>

plugins/tags/js/post.js

@@ -57 +57 @@
           });
      });
-});
 
-// Toolbar button for tags
-dcToolBarManager.bind('onInit','wiki',function() {
-     jsToolBar.prototype.elements.tagSpace = {type: 'space'};
-     
-     jsToolBar.prototype.elements.tag = {type: 'button', title: 'Keyword', fn:{} };
-     jsToolBar.prototype.elements.tag.context = 'post';
-     jsToolBar.prototype.elements.tag.icon = 'index.php?pf=tags/img/tag-add.png';
-     jsToolBar.prototype.elements.tag.fn.wiki = function() {
-          this.encloseSelection('','',function(str) {
-               if (str == '') { window.alert(dotclear.msg.no_selection); return ''; }
-               if (str.indexOf(',') != -1) {
-                    return str;
-               } else {
-                    window.dc_tag_editor.addMeta(str);
-                    return '['+str+'|tag:'+str+']';
-               }
-          });
-     };
-     jsToolBar.prototype.elements.tag.fn.xhtml = function() {
-          var url = this.elements.tag.url;
-          this.encloseSelection('','',function(str) {
-               if (str == '') { window.alert(dotclear.msg.no_selection); return ''; }
-               if (str.indexOf(',') != -1) {
-                    return str;
-               } else {
-                    window.dc_tag_editor.addMeta(str);
-                    return '<a href="'+this.stripBaseURL(url+'/'+str)+'">'+str+'</a>';
-               }
-          });
-     };
-     jsToolBar.prototype.elements.tag.fn.wysiwyg = function() {
-          var t = this.getSelectedText();
-          
-          if (t == '') { window.alert(dotclear.msg.no_selection); return; }
-          if (t.indexOf(',') != -1) { return; }
-          
-          var n = this.getSelectedNode();
-          var a = document.createElement('a');
-          a.href = this.stripBaseURL(this.elements.tag.url+'/'+t);
-          a.appendChild(n);
-          this.insertNode(a);
-          window.dc_tag_editor.addMeta(t);
-     };
-});
-
-dcToolBarManager.bind('onInit','xhtml',function() {
      tinymce.create('tinymce.plugins.dcTag', {
           init : function(ed, url) {
@@ -115 +68 @@
                           return;
                     }
-                    tinymce.execCommand("mceInsertLink", false, tinymce.plugins.dcTag.url+'/'+se.getContent(), {skip_undo : 1});
+                    
                     window.dc_tag_editor.addMeta(se.getContent());
+                    tinymce.execCommand('mceInsertLink', false, '#mce_temp_url#', {skip_undo : 1});
+          
+                    elementArray = tinymce.grep(ed.dom.select("a"),function(n) {return ed.dom.getAttrib(n,'href') == '#mce_temp_url#';});
+                    for (i=0; i<elementArray.length; i++) {
+                         var node = elementArray[i];
+                         ed.dom.setAttrib(node,'href',ed.getParam('tag_url_pattern')+'/'+se.getContent());
+                         ed.dom.setAttrib(node,'title','Tag: ' + se.getContent());
+                    }
+                    ed.focus();
+                    ed.selection.select(node);
+                    ed.selection.collapse(0);
+                    tinymce.storeSelection();
+                    tinymce.execCommand('mceEndUndoLevel');
                });
                
                ed.addButton('tag', {
-                    title : tinymce.plugins.dcTag.title,
+                    title : 'dcTag.tag_desc',
                     cmd : 'dcTag',
                     image :'index.php?pf=tags/img/tag-add.png'
                });
                
-               ed.addShortcut('ctrl+alt+t', 'advlink.advlink_desc', 'dcTag');
+               ed.addShortcut('ctrl+alt+t', 'dcTag.ta_desc', 'dcTag');
                
                ed.onNodeChange.add(function(ed, cm, n, co) {
-                    cm.setDisabled('tag', co && n.nodeName != 'A');
-                    cm.setActive('tag', n.nodeName == 'A' && !n.name);
+                    cm.setDisabled('tag', co || ed.dom.getParent(n, 'A'));
                });
           },
@@ -145 +110 @@
      
      tinymce.PluginManager.add('dcTag', tinymce.plugins.dcTag);
-     
-     tinymce.settings.plugins += ",-dcTag";
-     tinymce.settings.theme_advanced_buttons3 += ",tag";
 });