Changeset 2761:6b76144ca48b

Timestamp:

10/26/14 10:10:53 (9 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

CKEditor can now load external plugins such as tags, series,...
Closes #1992

Files:

• admin/post.php (modified) (3 diffs)
• plugins/dcCKEditor/_post_config.php (modified) (1 diff)
• plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php (modified) (2 diffs)
• plugins/dcCKEditor/index.php (modified) (1 diff)
• plugins/tags/_admin.php (modified) (1 diff)

admin/post.php

@@ -65 +65 @@
 foreach ($core_formaters as $editor => $formats) {
      foreach ($formats as $format) {
-        $available_formats[$format] = $format;
-    }
+          $available_formats[$format] = $format;
+     }
 }
 
@@ -377 +377 @@
 $admin_post_behavior = '';
 if ($post_editor && !empty($post_editor[$post_format])) {
-     $admin_post_behavior = $core->callBehavior('adminPostEditor', $post_editor[$post_format]);
+     $admin_post_behavior = $core->callBehavior('adminPostEditor', $post_editor[$post_format], 'post');
 }
 
@@ -384 +384 @@
      dcPage::jsModal().
      dcPage::jsMetaEditor().
-    $admin_post_behavior.
+     $admin_post_behavior.
      dcPage::jsLoad('js/_post.js').
      dcPage::jsConfirmClose('entry-form','comment-form').

plugins/dcCKEditor/_post_config.php

@@ -13 +13 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 header('Content-type: text/javascript');
+if (!empty($_GET['context'])) {
+     $context = $_GET['context'];
+} else {
+     $context = '';
+}
 $__extraPlugins = new ArrayObject();
-$core->callBehavior('ckeditorExtraPlugins',$__extraPlugins);
+$core->callBehavior('ckeditorExtraPlugins',$__extraPlugins,$context);
 $extraPlugins = $__extraPlugins->getArrayCopy();
 ?>

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

@@ -16 +16 @@
     protected static $config_url = 'plugin.php?p=dcCKEditor&config=1';
 
-    public static function adminPostEditor($editor='') {
+    public static function adminPostEditor($editor='',$context='') {
         if (empty($editor) || $editor!='dcCKEditor') { return;}
+
+        $config_js = self::$config_url;
+        if (!empty($context)) {
+            $config_js .= '&context='.$context;
+        }
 
         return
@@ -39 +44 @@
             dcPage::jsLoad(self::$p_url.'/js/ckeditor/ckeditor.js').
             dcPage::jsLoad(self::$p_url.'/js/ckeditor/adapters/jquery.js').
-            dcPage::jsLoad(self::$config_url);
+            dcPage::jsLoad($config_js);
      }
 

plugins/dcCKEditor/index.php

@@ -27 +27 @@
 if (!empty($_GET['config'])) {
     // text/javascript response stop stream just after including file
-    include_once(dirname(__FILE__).'/_post_config.php');    
+    include_once(dirname(__FILE__).'/_post_config.php');
     exit();
-} else {    
+} else {
     include_once(dirname(__FILE__).'/inc/_config.php');
 }
-

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
 class tagsBehaviors
 {
-    public static function ckeditorExtraPlugins(ArrayObject $extraPlugins)
+    public static function ckeditorExtraPlugins(ArrayObject $extraPlugins, $context)
     {
         global $core;
 
+        if ($context!='post') {
+            return;
+        }
         $extraPlugins[] = array(
             'name' => 'dctags',