Changeset 3024:b4724a397193

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

Files:

• admin/category.php (modified) (1 diff)
• admin/comment.php (modified) (1 diff)
• admin/index.php (modified) (1 diff)
• admin/post.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)
• plugins/pages/page.php (modified) (1 diff)
• plugins/tags/inc/tags.behaviors.php (modified) (1 diff)

admin/category.php

@@ -179 +179 @@
      dcPage::jsConfirmClose('category-form').
      dcPage::jsLoad('js/_category.js').
-     $core->callBehavior('adminPostEditor',$category_editor['xhtml'],'category',array('#cat_desc')),
+     $core->callBehavior('adminPostEditor',$category_editor['xhtml'],'category',array('#cat_desc'),'xhtml'),
      dcPage::breadcrumb($elements)
 );

admin/comment.php

@@ -183 +183 @@
      dcPage::jsConfirmClose('comment-form').
      dcPage::jsLoad('js/_comment.js').
-     $core->callBehavior('adminPostEditor',$comment_editor['xhtml'],'comment',array('#comment_content')).
+     $core->callBehavior('adminPostEditor',$comment_editor['xhtml'],'comment',array('#comment_content'),'xhtml').
      # --BEHAVIOR-- adminCommentHeaders
      $core->callBehavior('adminCommentHeaders'),

admin/index.php

@@ -177 +177 @@
           if ($post_editor && !empty($post_editor[$post_format])) {
                // context is not post because of tags not available
-               $admin_post_behavior = $core->callBehavior('adminPostEditor', $post_editor[$post_format], 'quickentry', array('#post_content'));
+               $admin_post_behavior = $core->callBehavior('adminPostEditor', $post_editor[$post_format], 'quickentry', array('#post_content'),$post_format);
           }
      }

admin/post.php

@@ -385 +385 @@
     if ($p_edit == $c_edit) {
         $admin_post_behavior .= $core->callBehavior('adminPostEditor',
-            $p_edit,'post',array('#post_excerpt','#post_content','#comment_content'));
+            $p_edit,'post',array('#post_excerpt','#post_content','#comment_content'),$post_format);
     } else {
         $admin_post_behavior .= $core->callBehavior('adminPostEditor',
-            $p_edit,'post',array('#post_excerpt','#post_content'));
+            $p_edit,'post',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/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;