Changeset 16090 for trunk/wp-admin/includes/post.php

Timestamp:

10/29/2010 08:06:00 PM (16 years ago)

Author:

azaozz

Message:

Editor: utilize the new "formats" option in TinyMCE, fix errors in IE when pressing Enter inside a caption box, fix resizing of the caption box when the user soft-resizes the image in the editor, fixes #12574

File:

• trunk/wp-admin/includes/post.php (modified) (2 diffs)

trunk/wp-admin/includes/post.php

@@ -1443 +1443 @@
                 'theme_advanced_resize_horizontal' => false,
                 'dialog_type' => 'modal',
+                'formats' => "{
+                        alignleft : [
+                                {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},
+                                {selector : 'img,table', classes : 'alignleft'}
+                        ],
+                        aligncenter : [
+                                {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},
+                                {selector : 'img,table', classes : 'aligncenter'}
+                        ],
+                        alignright : [
+                                {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},
+                                {selector : 'img,table', classes : 'alignright'}
+                        ],
+                        strikethrough : {inline : 'del'}
+                }",
                 'relative_urls' => false,
                 'remove_script_host' => false,
@@ -1527 +1542 @@
 
         $mce_options = '';
-        foreach ( $initArray as $k => $v )
-            $mce_options .= $k . ':"' . $v . '", ';
+        foreach ( $initArray as $k => $v ) {
+                if ( is_bool($v) ) {
+                        $val = $v ? 'true' : 'false';
+                        $mce_options .= $k . ':' . $val . ', ';
+                        continue;
+                } elseif ( is_string($v) && ( '{' == $v{0} || '[' == $v{0} ) ) {
+                        $mce_options .= $k . ':' . $v . ', ';
+                        continue;
+                }
+
+                $mce_options .= $k . ':"' . $v . '", ';
+        }
 
         $mce_options = rtrim( trim($mce_options), '\n\r,' ); ?>