Changeset 2751:a96ec5640056 for plugins

Timestamp:

09/09/14 16:30:31 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Each editor (ckeditor, legacy ones) loads its own context when it is active.
Add plugin_id parameter to transmit that context
Remove call of ckeditorExtraPlugins behavior until a good solution is found.
Closes #1983

Location:

plugins

Files:

• dcCKEditor/_post_config.php (modified) (6 diffs)
• dcCKEditor/js/ckeditor-plugins/dclink/plugin.js (modified) (2 diffs)
• dcCKEditor/js/ckeditor-plugins/entrylink/plugin.js (modified) (3 diffs)
• dcCKEditor/js/ckeditor-plugins/media/plugin.js (modified) (2 diffs)
• dcCKEditor/js/popup_link.js (modified) (1 diff)
• dcCKEditor/js/popup_media.js (modified) (2 diffs)
• dcCKEditor/js/popup_posts.js (modified) (1 diff)
• dcLegacyEditor/js/_post_editor.js (modified) (5 diffs)
• dcLegacyEditor/js/jsToolBar/jsToolBar.dotclear.js (modified) (3 diffs)
• tags/_admin.php (modified) (1 diff)

plugins/dcCKEditor/_post_config.php

@@ -31 +31 @@
                }
           }
-          
+
           return url;
      };
 
-     /* Retrieve editor name from URL */
-     $.getEditorName = function getEditorName(url) {
-          return url.replace(/.*editor=([^&]*)(&.*)?/,'$1');
+     /* Retrieve editor from popup */
+    $.active_editor = null;
+     $.getEditorName = function getEditorName() {
+          return $.active_editor;
      }
 })(jQuery);
@@ -49 +50 @@
      CKEDITOR.config.skin = 'dotclear,'+dotclear.dcckeditor_plugin_url+'/js/ckeditor-skins/dotclear/';
 
-<?php if (!empty($dcckeditor_cancollapse_button)):?>    
+<?php if (!empty($dcckeditor_cancollapse_button)):?>
      CKEDITOR.config.toolbarCanCollapse = true;
 <?php endif;?>
-     
-     CKEDITOR.plugins.addExternal('entrylink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/entrylink/');   
+
+     CKEDITOR.plugins.addExternal('entrylink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/entrylink/');
      CKEDITOR.plugins.addExternal('dclink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/dclink/');
      CKEDITOR.plugins.addExternal('media',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/media/');
@@ -75 +76 @@
           extraPlugins: '<?php echo $defautExtraPlugins;?>',
 
-          <?php if (!empty($dcckeditor_format_select)):?>                  
+          <?php if (!empty($dcckeditor_format_select)):?>
           // format tags
           format_tags: 'p;h1;h2;h3;h4;h5;h6;pre;address',
@@ -102 +103 @@
 <?php endif;?>
                          'Bold','Italic','Underline','Strike','Subscript','Superscript','Code','Blockquote',
-                         
+
 <?php if (!empty($dcckeditor_list_buttons)):?>
                          'NumberedList', 'BulletedList',
@@ -135 +136 @@
                 ,'TextColor'
 <?php endif;?>
-                    ] 
+                    ]
                },
                <?php // add extra buttons comming from dotclear plugins
@@ -156 +157 @@
                $('#cke_post_excerpt').addClass('hide');
           }
-          
+
           $('#excerpt-area label').click(function() {
                $('#cke_post_excerpt').toggleClass('hide',$('#post_excerpt').hasClass('hide'));
           });
      });
+
+     // @TODO: find a better way to retrieve active editor
+     for (var id in CKEDITOR.instances) {
+          CKEDITOR.instances[id].on('focus', function(e) {
+               $.active_editor = e.editor.name;
+          });
+     }
 });

plugins/dcCKEditor/js/ckeditor-plugins/dclink/plugin.js

@@ -6 +6 @@
                     exec: function(editor) {
                          if (editor.getSelection().getNative().toString().replace(/\s*/,'')!='') {
-                              $.toolbarPopup('popup_link.php?editor='+editor.name);
+                              $.toolbarPopup('popup_link.php?plugin_id=dcCKEditor');
                          }
                     }
@@ -26 +26 @@
                               editor.getSelection().selectElement(element);
 
-                              var popup_url = 'popup_link.php?editor='+editor.name;
+                              var popup_url = 'popup_link.php?plugin_id=dcCKEditor';
                               if (element.getAttribute('href')) {
                                    popup_url += '&href='+element.getAttribute('href');

plugins/dcCKEditor/js/ckeditor-plugins/entrylink/plugin.js

@@ -6 +6 @@
                     exec: function(editor) {
                          if (editor.getSelection().getNative().toString().replace(/\s*/,'')!='') {
-                              $.toolbarPopup('popup_posts.php?popup=1&editor='+editor.name);
+                              $.toolbarPopup('popup_posts.php?popup=1&plugin_id=dcCKEditor');
                          }
                     }
@@ -18 +18 @@
 
                editor.on('doubleclick',function(e) {
-                    var element = CKEDITOR.plugins.link.getSelectedLink( editor ) || e.data.element;
+                    var element = CKEDITOR.plugins.link.getSelectedLink(editor) || e.data.element;
                     if (!element.isReadOnly()) {
                          if (element.is('a')
@@ -25 +25 @@
                               editor.getSelection().selectElement(element);
 
-                              $.toolbarPopup('popup_posts.php?popup=1&editor='+editor.name);
+                              $.toolbarPopup('popup_posts.php?popup=1&plugin_id=dcCKEditor');
                               return false;
                          }

plugins/dcCKEditor/js/ckeditor-plugins/media/plugin.js

@@ -5 +5 @@
                editor.addCommand('mediaCommand', {
                     exec: function(editor) {
-                         $.toolbarPopup('media.php?popup=1&editor='+editor.name);
+                         $.toolbarPopup('media.php?popup=1&plugin_id=dcCKEditor');
                     }
                });
@@ -19 +19 @@
                     if (!element.isReadOnly()) {
                          if (element.is('img') || (element.is('a') && element.hasClass('media-link'))) {
-                              $.toolbarPopup('media.php?popup=1&editor='+editor.name);
+                              $.toolbarPopup('media.php?popup=1&plugin_id=dcCKEditor');
                               return false;
                          }

plugins/dcCKEditor/js/popup_link.js

@@ -6 +6 @@
      $('#link-insert-ok').click(function() {
           var insert_form = $('#link-insert-form').get(0);
-          if (insert_form == undefined) { 
-               return; 
+          if (insert_form == undefined) {
+               return;
           }
 
-          var editor_name = window.opener.$.getEditorName(document.location.search),
+          var editor_name = window.opener.$.getEditorName(),
           editor = window.opener.CKEDITOR.instances[editor_name],
-          link = '',     
+          link = '',
           selected_text = editor.getSelection().getNative().toString();
 

plugins/dcCKEditor/js/popup_media.js

@@ -3 +3 @@
           window.close();
      });
-     
+
      $('#media-insert-ok').click(function() {
           var insert_form = $('#media-insert-form').get(0);
-          if (insert_form === undefined) { 
-               return; 
+          if (insert_form === undefined) {
+               return;
           }
 
-          var editor_name = window.opener.$.getEditorName(document.location.search),
+          var editor_name = window.opener.$.getEditorName(),
           editor = window.opener.CKEDITOR.instances[editor_name],
           type = insert_form.elements.type.value,
@@ -47 +47 @@
                          element = window.opener.CKEDITOR.dom.element.createFromHtml(img);
                     }
-                         
+
                     editor.insertElement(element);
                }

plugins/dcCKEditor/js/popup_posts.js

@@ -6 +6 @@
      $('#form-entries tr>td.maximal>a').click(function(e) {
           e.preventDefault();
-          var editor_name = window.opener.$.getEditorName(document.location.search),
+          var editor_name = window.opener.$.getEditorName(),
           editor = window.opener.CKEDITOR.instances[editor_name],
           link = '',

plugins/dcLegacyEditor/js/_post_editor.js

@@ -1 +1 @@
 $(function() {
      if ($('#edit-entry').length==0) {return;}
-
-     // remove editor prefix
-     var getPostFormat = function getPostFormat(post_format) {
-          return post_format.replace(/[^:]*:/,'');
-     };
-     var getPostEditor = function getPostEditor(post_format) {
-          return post_format.replace(/:.*/,'');
-     };
 
      // Get document format and prepare toolbars
@@ -14 +6 @@
      var last_post_format = $(formatField).val();
      $(formatField).change(function() {
-          if (getPostEditor(this.value)!='dcLegacyEditor') { return;}
+          if (this.value!='dcLegacyEditor') { return;}
 
-          var post_format = getPostFormat(this.value);
+          var post_format = this.value;
 
           // Confirm post format change
@@ -37 +29 @@
 
      $('.format_control > *').addClass('hide');
-     $('.format_control:not(.control_no_'+getPostFormat(last_post_format)+') > *').removeClass('hide');
+     $('.format_control:not(.control_no_'+last_post_format+') > *').removeClass('hide');
 
      if ($('#comment_content').length>0) {
@@ -61 +53 @@
                     excerpt: excerpt_content,
                     content: post_content,
-                    format: getPostFormat($('#post_format').get(0).value),
+                    format: $('#post_format').get(0).value,
                     lang: $('#post_lang').get(0).value
                };
@@ -111 +103 @@
 
           // Load toolbars
-          contentTb.switchMode(getPostFormat(formatField.value));
-          excerptTb.switchMode(getPostFormat(formatField.value));
+          contentTb.switchMode(formatField.value);
+          excerptTb.switchMode(formatField.value);
 
           // Check unsaved changes before XHTML conversion

plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.dotclear.js

@@ -5 +5 @@
 jsToolBar.prototype.elements.link.open_url = 'popup_link.php';
 
-jsToolBar.prototype.elements.link.popup = function (args) {
+jsToolBar.prototype.elements.link.popup = function(args) {
      window.the_toolbar = this;
      args = args || '';
@@ -155 +155 @@
      fn: {},
      fncall: {},
-     open_url: 'media.php?popup=1',
+     open_url: 'media.php?popup=1&plugin_id=dcLegacyEditor',
      data: {},
      popup: function() {
@@ -355 +355 @@
      title: 'Link to an entry',
      fn: {},
-     open_url: 'popup_posts.php',
+     open_url: 'popup_posts.php?plugin_id=dcLegacyEditor',
      data: {},
      popup: function() {

plugins/tags/_admin.php

@@ -40 +40 @@
 $core->addBehavior('adminPageHelpBlock', array('tagsBehaviors', 'adminPageHelpBlock'));
 
-$core->addBehavior('ckeditorExtraPlugins', array('tagsBehaviors', 'ckeditorExtraPlugins'));
+//$core->addBehavior('ckeditorExtraPlugins', array('tagsBehaviors', 'ckeditorExtraPlugins'));
 
 # BEHAVIORS