Changeset 8248

Timestamp:

07/03/2008 03:55:45 PM (17 years ago)

Author:

ryan

Message:

Add med buttons to TinyMCE fullscreen. Props azaozz. fixes #7232

Location:

trunk

Files:

• wp-admin/gears-manifest.php (modified) (2 diffs)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/js/tinymce/langs/wp-langs.php (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wordpress/img/audio.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/img/image.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/img/media.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/img/video.gif (added)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/gears-manifest.php

@@ -65 +65 @@
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>_20080701",
+"version" : "<?php echo $man_version; ?>_20080703",
 "entries" : [
 <?php echo $defaults; ?>
@@ -192 +192 @@
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" },
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" }
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/image.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" }
 ]}

trunk/wp-admin/includes/media.php

@@ -232 +232 @@
     $out = <<<EOF
 
-    <a href="{$image_upload_iframe_src}&amp;TB_iframe=true" class="thickbox" title='$image_title'><img src='images/media-button-image.gif' alt='$image_title' /></a>
-    <a href="{$video_upload_iframe_src}&amp;TB_iframe=true" class="thickbox" title='$video_title'><img src='images/media-button-video.gif' alt='$video_title' /></a>
-    <a href="{$audio_upload_iframe_src}&amp;TB_iframe=true" class="thickbox" title='$audio_title'><img src='images/media-button-music.gif' alt='$audio_title' /></a>
-    <a href="{$media_upload_iframe_src}&amp;TB_iframe=true" class="thickbox" title='$media_title'><img src='images/media-button-other.gif' alt='$media_title' /></a>
+    <a href="{$image_upload_iframe_src}&amp;TB_iframe=true" id="add_image" class="thickbox" title='$image_title'><img src='images/media-button-image.gif' alt='$image_title' /></a>
+    <a href="{$video_upload_iframe_src}&amp;TB_iframe=true" id="add_video" class="thickbox" title='$video_title'><img src='images/media-button-video.gif' alt='$video_title' /></a>
+    <a href="{$audio_upload_iframe_src}&amp;TB_iframe=true" id="add_audio" class="thickbox" title='$audio_title'><img src='images/media-button-music.gif' alt='$audio_title' /></a>
+    <a href="{$media_upload_iframe_src}&amp;TB_iframe=true" id="add_media" class="thickbox" title='$media_title'><img src='images/media-button-other.gif' alt='$media_title' /></a>
 
 EOF;

trunk/wp-admin/includes/post.php

@@ -94 +94 @@
         $mn = $_POST['mn'];
         $ss = $_POST['ss'];
+        $aa = ($aa <= 0 ) ? date('Y') : $aa;
+        $mm = ($mm <= 0 ) ? date('n') : $mm;
         $jj = ($jj > 31 ) ? 31 : $jj;
+        $jj = ($jj <= 0 ) ? date('j') : $jj;
         $hh = ($hh > 23 ) ? $hh -24 : $hh;
         $mn = ($mn > 59 ) ? $mn -60 : $mn;

trunk/wp-includes/js/tinymce/langs/wp-langs.php

@@ -396 +396 @@
 wp_help_desc:"' . mce_escape( __('Help') ) . ' (Alt+Shift+H)",
 wp_more_alt:"' . mce_escape( __('More...') ) . '",
-wp_page_alt:"' . mce_escape( __('Next page...') ) . '"
+wp_page_alt:"' . mce_escape( __('Next page...') ) . '",
+add_media:"' . mce_escape( __('Add Media') ) . '",
+add_image:"' . mce_escape( __('Add an Image') ) . '",
+add_video:"' . mce_escape( __('Add Video') ) . '",
+add_audio:"' . mce_escape( __('Add Audio') ) . '"
 });
 

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -89 +89 @@
                 cmd : 'WP_Adv'
             });
+
+            // Add Media buttons
+            ed.addButton('add_media', {
+                title : 'wordpress.add_media',
+                image : url + '/img/media.gif',
+                onclick : function() {
+                    tb_show('', tinymce.DOM.get('add_media').href);
+                    tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+                }
+            });
+
+            ed.addButton('add_image', {
+                title : 'wordpress.add_image',
+                image : url + '/img/image.gif',
+                onclick : function() {
+                    tb_show('', tinymce.DOM.get('add_image').href);
+                    tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+                }
+            });
+
+            ed.addButton('add_video', {
+                title : 'wordpress.add_video',
+                image : url + '/img/video.gif',
+                onclick : function() {
+                    tb_show('', tinymce.DOM.get('add_video').href);
+                    tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+                }
+            });
+
+            ed.addButton('add_audio', {
+                title : 'wordpress.add_audio',
+                image : url + '/img/audio.gif',
+                onclick : function() {
+                    tb_show('', tinymce.DOM.get('add_audio').href);
+                    tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+                }
+            });
+
+            // Add Media buttons to fullscreen
+            ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) {
+                if ( 'mceFullScreen' != cmd ) return;
+                if ( 'mce_fullscreen' != ed.id )
+                    ed.settings.theme_advanced_buttons1 += ',|,add_image,add_video,add_audio,add_media';
+            });
 
             // Add class "alignleft", "alignright" and "aligncenter" when selecting align for images.

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -223 +223 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080702');
+    $cacheKey = apply_filters('tiny_mce_version', '20080703');
 
     foreach ( $initArray as $v )

trunk/wp-includes/script-loader.php

@@ -38 +38 @@
 
     // Modify this version when tinyMCE plugins are changed.
-    $mce_version = apply_filters('tiny_mce_version', '20080701');
+    $mce_version = apply_filters('tiny_mce_version', '20080703');
     $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );