Changeset 10135

Timestamp:

12/09/2008 02:50:28 AM (17 years ago)

Author:

azaozz

Message:

Fix external dependencies in class.wp-scripts.php, fixes #8505

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-includes/class.wp-scripts.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (13 diffs)

trunk/wp-admin/admin-header.php

@@ -30 +30 @@
 //<![CDATA[
 addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document).ready(func); else if (typeof wpOnload!='function'){wpOnload=func;} else {var oldonload=wpOnload; wpOnload=function(){oldonload();func();}}};
+
+function convertEntities(o) {
+    var c = function(s) {
+        if (/&[^;]+;/.test(s)) {
+            var e = document.createElement("div");
+            e.innerHTML = s;
+            return !e.firstChild ? s : e.firstChild.nodeValue;
+        }
+        return s;
+    }
+
+    if ( typeof o === 'string' )
+        return c(o);
+    else if ( typeof o === 'object' )
+        for (var v in o) {
+            if ( typeof o[v] === 'string' )
+                o[v] = c(o[v]);
+        }
+    return o;
+};
 //]]>
 </script>

trunk/wp-includes/class.wp-scripts.php

@@ -45 +45 @@
         echo "<script type='text/javascript'>\n";
         echo "/* <![CDATA[ */\n";
-        echo "function convertEntities(o) {\n";
-        echo "  var c = function(s) {\n";
-        echo "      if (/&[^;]+;/.test(s)) {\n";
-        echo "          var e = document.createElement('div');\n";
-        echo "          e.innerHTML = s;\n";
-        echo "          return !e.firstChild ? s : e.firstChild.nodeValue;\n";
-        echo "      }\n";
-        echo "      return s;\n";
-        echo "  }\n";
-        echo "  if ( typeof o === 'string' ) {\n";
-        echo "      return c(o);\n";
-        echo "  } else if ( typeof o === 'object' ) {\n";
-        echo "      for (var v in o) {\n";
-        echo "          if ( typeof o[v] === 'string' )\n";
-        echo "              o[v] = c(o[v]);\n";
-        echo "      }\n";
-        echo "  }\n";
-        echo "  return o;\n";
-        echo "};\n";
         echo "\t$object_name = {\n";
         $eol = '';
         foreach ( $this->registered[$handle]->extra['l10n'][1] as $var => $val ) {
+            if ( 'l10n_print_after' == $var ) {
+                $after = $val;
+                continue;
+            }
             echo "$eol\t\t$var: \"" . js_escape( $val ) . '"';
             $eol = ",\n";
         }
         echo "\n\t}\n";
-        echo "try{convertEntities($object_name);}catch(e){};\n";
+        echo isset($after) ? "\t$after\n" : '';
         echo "/* ]]> */\n";
         echo "</script>\n";

trunk/wp-includes/script-loader.php

@@ -55 +55 @@
         'enterURL' => __('Enter the URL'),
         'enterImageURL' => __('Enter the URL of the image'),
-        'enterImageDescription' => __('Enter a description of the image')
+        'enterImageDescription' => __('Enter a description of the image'),
+        'l10n_print_after' => 'try{convertEntities(quicktagsL10n);}catch(e){};'
     ) );
 
@@ -73 +74 @@
     $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
         'noPerm' => __('You do not have permission to do that.'),
-        'broken' => __('An unidentified error has occurred.')
+        'broken' => __('An unidentified error has occurred.'),
+        'l10n_print_after' => 'try{convertEntities(wpAjax);}catch(e){};'
     ) );
 
@@ -128 +130 @@
             'dismiss' => __('Dismiss'),
             'crunching' => __('Crunching…'),
-            'deleted' => __('Deleted')
+            'deleted' => __('Deleted'),
+            'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};'
     ) );
 
@@ -144 +147 @@
         $scripts->localize( 'ajaxcat', 'catL10n', array(
             'add' => attribute_escape(__('Add')),
-            'how' => __('Separate multiple categories with commas.')
+            'how' => __('Separate multiple categories with commas.'),
+            'l10n_print_after' => 'try{convertEntities(catL10n);}catch(e){};'
         ) );
         $scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20081117' );
@@ -155 +159 @@
             'bad' => __('Weak'),
             'good' => _c('Medium|password strength'),
-            'strong' => __('Strong')
+            'strong' => __('Strong'),
+            'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
         ) );
         $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081206' );
@@ -172 +177 @@
             'requestFile' => admin_url('admin-ajax.php'),
             'save' => __('Save'),
-            'cancel' => __('Cancel')
+            'cancel' => __('Cancel'),
+            'l10n_print_after' => 'try{convertEntities(slugL10n);}catch(e){};'
         ) );
         $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20081128' );
@@ -197 +203 @@
             'password' => __('Password Protected'),
             'privatelyPublished' => __('Privately Published'),
-            'published' => __('Published')
+            'published' => __('Published'),
+            'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
         ) );
         $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'wp-lists', 'postbox'), '20081128' );
@@ -217 +224 @@
             'password' => __('Password Protected'),
             'privatelyPublished' => __('Privately Published'),
-            'published' => __('Published')
+            'published' => __('Published'),
+            'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
         ) );
         $scripts->add( 'link', '/wp-admin/js/link.js', array('jquery-ui-tabs', 'wp-lists', 'postbox'), '20080925' );
@@ -224 +232 @@
             'cancel' => __('Cancel'),
             'edit' => __('Edit'),
-            'submittedOn' => __('Submitted on:')
+            'submittedOn' => __('Submitted on:'),
+            'l10n_print_after' => 'try{convertEntities(commentL10n);}catch(e){};'
         ) );
         $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20081127' );
@@ -235 +244 @@
             'cancel' => __('Cancel'),
             'lameReminder' => __('Remember to click the "Save Changes" button at the bottom of the Current Widgets column after you\'re all done!'),
-            'lamerReminder' => __("You're about to leave without having saved your changes!")
+            'lamerReminder' => __("You're about to leave without having saved your changes!"),
+            'l10n_print_after' => 'try{convertEntities(widgetsL10n);}catch(e){};'
         ));
 
         $scripts->add( 'word-count', '/wp-admin/js/word-count.js', array( 'jquery' ), '20080423' );
         $scripts->localize( 'word-count', 'wordCountL10n', array(
-            'count' => __('Word count: %d')
+            'count' => __('Word count: %d'),
+            'l10n_print_after' => 'try{convertEntities(wordCountL10n);}catch(e){};'
         ));
 
@@ -246 +257 @@
         $scripts->localize( 'wp-gears', 'wpGearsL10n', array(
             'updateCompleted' => __('Update completed.'),
-            'error' => __('Error:')
+            'error' => __('Error:'),
+            'l10n_print_after' => 'try{convertEntities(wpGearsL10n);}catch(e){};'
         ));
 
@@ -255 +267 @@
             'error' => __('Error while saving the changes.'),
             'ntdeltitle' => __('Remove From Bulk Edit'),
-            'notitle' => __('(no title)')
+            'notitle' => __('(no title)'),
+            'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
         ) );
 
         $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081206' );
         $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
-            'error' => __('Error while saving the changes.')
+            'error' => __('Error while saving the changes.'),
+            'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
         ) );
 
         $scripts->add( 'plugin-install', '/wp-admin/js/plugin-install.js', array( 'thickbox', 'jquery' ), '20080803' );
         $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
-            'plugin_information' => __('Plugin Information:')
+            'plugin_information' => __('Plugin Information:'),
+            'l10n_print_after' => 'try{convertEntities(plugininstallL10n);}catch(e){};'
         ) );
 
@@ -371 +386 @@
         'previewPostText' => __('Preview this Post'),
         'requestFile' => admin_url('admin-ajax.php'),
-        'savingText' => __('Saving Draft…')
+        'savingText' => __('Saving Draft…'),
+        'l10n_print_after' => 'try{convertEntities(autosaveL10n);}catch(e){};'
     ) );