Changeset 2856:b9ae6bf9bd6e for admin

Timestamp:

12/17/14 11:40:49 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

2.7

Message:

Load wanted editor for each context
Closes #2011, Closes #2014

Location:

admin

Files:

• js/_index.js (modified) (1 diff)
• post.php (modified) (1 diff)

admin/js/_index.js

@@ -2 +2 @@
      var f = $('#quick-entry');
      if (f.length > 0) {
-          if ($.isFunction('jsToolBar')) {
+          if (typeof(jsToolBar)!==undefined) {
                var contentTb = new jsToolBar($('#post_content',f)[0]);
                contentTb.switchMode($('#post_format',f).val());

admin/post.php

@@ -377 +377 @@
 
 $admin_post_behavior = '';
-if ($post_editor && !empty($post_editor[$post_format])) {
-     $admin_post_behavior = $core->callBehavior('adminPostEditor', $post_editor[$post_format], 'post', array('#post_excerpt','#post_content,#comment_content'));
+if ($post_editor) {
+    $p_edit = $c_edit = '';
+    if (!empty($post_editor[$post_format])) {
+        $p_edit = $post_editor[$post_format];
+    }
+    if (!empty($post_editor['xhtml'])) {
+        $c_edit = $post_editor['xhtml'];
+    }
+    if ($p_edit == $c_edit) {
+        $admin_post_behavior .= $core->callBehavior('adminPostEditor',
+            $p_edit,'post',array('#post_excerpt','#post_content','#comment_content'));
+    } else {
+        $admin_post_behavior .= $core->callBehavior('adminPostEditor',
+            $p_edit,'post',array('#post_excerpt','#post_content'));
+        $admin_post_behavior .= $core->callBehavior('adminPostEditor',
+            $c_edit,'comment',array('#comment_content'));
+    }
 }