Changeset 10369
- Timestamp:
- 01/16/2009 12:58:38 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 1 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/admin-header.php
r10364 r10369 39 39 40 40 if ( in_array( $pagenow, array('post.php', 'post-new.php', 'page.php', 'page-new.php') ) ) { 41 add_action( 'admin_ footer', 'wp_tiny_mce');41 add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 ); 42 42 wp_enqueue_script('quicktags'); 43 43 } -
trunk/wp-admin/includes/post.php
r10338 r10369 1114 1114 */ 1115 1115 function wp_tiny_mce( $teeny = false ) { 1116 global $concatenate_scripts, $compress_scripts; 1117 1116 1118 if ( ! user_can_richedit() ) 1117 1119 return; … … 1144 1146 $mce_external_plugins = apply_filters('mce_external_plugins', array()); 1145 1147 1146 $ext_plugins = "\n";1148 $ext_plugins = ''; 1147 1149 if ( ! empty($mce_external_plugins) ) { 1148 1150 … … 1286 1288 } 1287 1289 1290 if ( ! isset($concatenate_scripts) ) 1291 script_concat_settings(); 1292 1288 1293 $language = $initArray['language']; 1289 1290 $ver = apply_filters('tiny_mce_version', '3 101');1294 $zip = $compress_scripts ? 1 : 0; 1295 $ver = apply_filters('tiny_mce_version', '3211'); 1291 1296 1292 1297 if ( 'en' != $language ) … … 1306 1311 query : "ver=<?php echo $ver; ?>", 1307 1312 mceInit : {<?php echo $mce_options; ?>}, 1308 1309 go : function() { 1310 var t = this, sl = tinymce.ScriptLoader, ln = t.mceInit.language, th = t.mceInit.theme, pl = t.mceInit.plugins; 1311 1312 sl.markDone(t.base + '/langs/' + ln + '.js'); 1313 1314 sl.markDone(t.base + '/themes/' + th + '/langs/' + ln + '.js'); 1315 sl.markDone(t.base + '/themes/' + th + '/langs/' + ln + '_dlg.js'); 1316 1317 tinymce.each(pl.split(','), function(n) { 1318 if (n && n.charAt(0) != '-') { 1319 sl.markDone(t.base + '/plugins/' + n + '/langs/' + ln + '.js'); 1320 sl.markDone(t.base + '/plugins/' + n + '/langs/' + ln + '_dlg.js'); 1321 } 1322 }); 1323 }, 1324 1325 load_ext : function(url,lang) { 1326 var sl = tinymce.ScriptLoader; 1327 1328 sl.markDone(url + '/langs/' + lang + '.js'); 1329 sl.markDone(url + '/langs/' + lang + '_dlg.js'); 1330 } 1313 load_ext : function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');} 1331 1314 }; 1332 1315 /* ]]> */ 1333 1316 </script> 1334 <script type="text/javascript" src="<?php echo $baseurl; ?>/tiny_mce.js?ver=<?php echo $ver; ?>"></script> 1335 <?php if ( 'en' != $language && isset($lang) ) { ?> 1336 <script type="text/javascript"> 1337 <?php echo $lang; ?> 1338 </script> 1339 <?php } else { ?> 1340 <script type="text/javascript" src="<?php echo $baseurl; ?>/langs/wp-langs-en.js?ver=<?php echo $ver; ?>"></script> 1341 <?php } ?> 1317 1318 <?php 1319 if ( $concatenate_scripts ) { 1320 echo "<script type='text/javascript' src='$baseurl/wp-tinymce.php?c=$zip&ver=$ver'></script>"; 1321 } else { 1322 echo "<script type='text/javascript' src='$baseurl/tiny_mce.js?ver=$ver'></script>"; 1323 1324 if ( 'en' != $language && isset($lang) ) 1325 echo "<script type='text/javascript'>\n$lang\n</script>"; 1326 else 1327 echo "<script type='text/javascript' src='$baseurl/langs/wp-langs-en.js?ver=$ver'></script>"; 1328 } 1329 ?> 1330 1342 1331 <script type="text/javascript"> 1343 1332 <?php if ( $ext_plugins ) echo $ext_plugins; ?> 1344 1345 // Mark translations as done 1333 <?php if ( $concatenate_scripts ) { ?> 1346 1334 tinyMCEPreInit.go(); 1347 1348 // Init 1335 <?php } else { ?> 1336 (function(){var t=tinyMCEPreInit,sl=tinymce.ScriptLoader,ln=t.mceInit.language,th=t.mceInit.theme,pl=t.mceInit.plugins;sl.markDone(t.base+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'_dlg.js');tinymce.each(pl.split(','),function(n){if(n&&n.charAt(0)!='-'){sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'.js');sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'_dlg.js');}});})(); 1337 <?php } ?> 1349 1338 tinyMCE.init(tinyMCEPreInit.mceInit); 1350 1339 </script> 1351 1352 1340 <?php 1353 1341 } 1354 ?>
Note: See TracChangeset
for help on using the changeset viewer.