Changeset 10086

Timestamp:

12/06/2008 09:54:24 AM (17 years ago)

Author:

westi

Message:

Move convertEntities js function into the BackPress scriptloader. Fixes #8505 props sambauers.

Location:

trunk

Files:

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

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 = '';