Changeset 3024:b4724a397193 for plugins

Timestamp:

06/30/15 19:01:11 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add syntax arg to adminPostEditor behaviour (may be 'wiki', 'xhtml', 'markdown', …), fixes #2042

Location:

plugins

Files:

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

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

@@ -22 +22 @@
      * @param context  <b>string</b> page context (post,page,comment,event,...)
      * @param tags     <b>array</b>  array of ids into inject editor
+     * @param syntax   <b>string</b> wanted syntax (xhtml)
      */
-    public static function adminPostEditor($editor='',$context='',array $tags=array()) {
-        if (empty($editor) || $editor!='dcCKEditor') { return;}
+    public static function adminPostEditor($editor='',$context='',array $tags=array(),$syntax='xhtml') {
+        if (empty($editor) || $editor != 'dcCKEditor' || $syntax != 'xhtml') { return;}
 
         $config_js = self::$config_url;

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

@@ -21 +21 @@
       * @param context  <b>string</b> page context (post,page,comment,event,...)
       * @param tags     <b>array</b>  array of ids to inject editor
+      * @param syntax   <b>string</b> wanted syntax (wiki,markdown,...)
       */
-     public static function adminPostEditor($editor='',$context='',array $tags=array()) {
+     public static function adminPostEditor($editor='',$context='',array $tags=array(),$syntax='') {
           if (empty($editor) || $editor!='dcLegacyEditor') {return;}
 
@@ -31 +32 @@
                "//<![CDATA[\n".
                dcPage::jsVar('dotclear.legacy_editor_context', $context).
+               dcPage::jsVar('dotclear.legacy_editor_syntax', $syntax).
                'dotclear.legacy_editor_tags_context = '.sprintf('{%s:["%s"]};'."\n", $context, implode('","', $tags)).
                "\n//]]>\n".

plugins/pages/page.php

@@ -295 +295 @@
      if ($p_edit == $c_edit) {
           $admin_post_behavior .= $core->callBehavior('adminPostEditor',
-               $p_edit,'page',array('#post_excerpt','#post_content','#comment_content'));
+               $p_edit,'page',array('#post_excerpt','#post_content','#comment_content'),$post_format);
      } else {
           $admin_post_behavior .= $core->callBehavior('adminPostEditor',
-               $p_edit,'page',array('#post_excerpt','#post_content'));
+               $p_edit,'page',array('#post_excerpt','#post_content'),$post_format);
           $admin_post_behavior .= $core->callBehavior('adminPostEditor',
-               $c_edit,'comment',array('#comment_content'));
+               $c_edit,'comment',array('#comment_content'),'xhtml');
      }
 }

plugins/tags/inc/tags.behaviors.php

@@ -14 +14 @@
 class tagsBehaviors
 {
-     public static function adminPostEditor($editor='',$context='',array $tags=array())
+     public static function adminPostEditor($editor='',$context='',array $tags=array(),$syntax='')
      {
           if (($editor != 'dcLegacyEditor' && $editor != 'dcCKEditor') || $context != 'post') return;