Changeset 2751:a96ec5640056 for plugins/dcLegacyEditor

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/dcLegacyEditor/js

Files:

• _post_editor.js (modified) (5 diffs)
• jsToolBar/jsToolBar.dotclear.js (modified) (3 diffs)

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() {