Changeset 2749:993aebff97bb

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

Files:

• admin/media_item.php (modified) (1 diff)
• admin/popup_link.php (modified) (1 diff)
• admin/popup_posts.php (modified) (1 diff)
• plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php (modified) (1 diff)
• plugins/dcLegacyEditor/inc/dc.legacy.editor.behaviors.php (modified) (2 diffs)

admin/media_item.php

@@ -208 +208 @@
      dcPage::jsLoad('js/_media_item.js');
 if ($popup) {
-     $starting_scripts .=
-     $core->callBehavior('adminPopupMedia');
+     // perhaps better to put active editor in session
+     $post_format = $core->auth->getOption('post_format');
+     $post_editor = $core->auth->getOption('editor');
+
+     $starting_scripts .= $core->callBehavior('adminPopupMedia', $post_editor[$post_format]);
 }
 call_user_func($open_f,__('Media manager'),

admin/popup_link.php

@@ -19 +19 @@
 $title = !empty($_GET['title']) ? $_GET['title'] : '';
 
-dcPage::openPopup(__('Add a link'),$core->callBehavior('adminPopupLink'));
+// perhaps better to put active editor in session
+$post_format = $core->auth->getOption('post_format');
+$post_editor = $core->auth->getOption('editor');
+
+dcPage::openPopup(__('Add a link'),$core->callBehavior('adminPopupLink', $post_editor[$post_format]));
 
 echo '<h2 class="page-title">'.__('Add a link').'</h2>';

admin/popup_posts.php

@@ -46 +46 @@
 }
 
+// perhaps better to put active editor in session
+$post_format = $core->auth->getOption('post_format');
+$post_editor = $core->auth->getOption('editor');
+
 dcPage::openPopup(__('Add a link to an entry'),
      dcPage::jsLoad('js/_posts_list.js').
-     $core->callBehavior('adminPopupPosts'));
+     $core->callBehavior('adminPopupPosts', $post_editor[$post_format]));
 
 echo '<h2 class="page-title">'.__('Add a link to an entry').'</h2>';

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');
      }