Changeset 2749:993aebff97bb for plugins

Timestamp:

09/02/14 22:05:33 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix call of javascript of all editors on media_item page but also popup_link and popup_posts
Closes #1983

Location:

plugins

Files:

• dcCKEditor/inc/dc.ckeditor.behaviors.php (modified) (1 diff)
• dcLegacyEditor/inc/dc.legacy.editor.behaviors.php (modified) (2 diffs)

plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php

@@ -42 +42 @@
      }
 
-    public static function adminPopupMedia() {
+    public static function adminPopupMedia($editor='') {
+        if (empty($editor) || $editor!='dcCKEditor') { return;}
+
      return dcPage::jsLoad(self::$p_url.'/js/popup_media.js');
     }
 
-    public static function adminPopupLink() {
+    public static function adminPopupLink($editor='') {
+        if (empty($editor) || $editor!='dcCKEditor') { return;}
+
      return dcPage::jsLoad(self::$p_url.'/js/popup_link.js');
     }
 
-    public static function adminPopupPosts() {
+    public static function adminPopupPosts($editor='') {
+        if (empty($editor) || $editor!='dcCKEditor') { return;}
+
      return dcPage::jsLoad(self::$p_url.'/js/popup_posts.js');
     }

plugins/dcLegacyEditor/inc/dc.legacy.editor.behaviors.php

@@ -16 +16 @@
 
      public static function adminPostEditor($editor='') {
-          global $core;
-
-          if (empty($editor) || $editor!='dcLegacyEditor') {
-               return;
-          }
+          if (empty($editor) || $editor!='dcLegacyEditor') {return;}
 
           return
@@ -27 +23 @@
      }
 
-     public static function adminPopupMedia() {
+     public static function adminPopupMedia($editor='') {
+          if (empty($editor) || $editor!='dcLegacyEditor') {return;}
+
           return dcPage::jsLoad(self::$p_url.'/js/jsToolBar/popup_media.js');
      }
 
-     public static function adminPopupLink() {
+     public static function adminPopupLink($editor='') {
+          if (empty($editor) || $editor!='dcLegacyEditor') {return;}
+
           return dcPage::jsLoad(self::$p_url.'/js/jsToolBar/popup_link.js');
      }
 
-     public static function adminPopupPosts() {
+     public static function adminPopupPosts($editor='') {
+          if (empty($editor) || $editor!='dcLegacyEditor') {return;}
+
           return dcPage::jsLoad(self::$p_url.'/js/jsToolBar/popup_posts.js');
      }