Tagging the 1.5rc1 release.

[jquery.git] / src / support.js

diff --git a/src/support.js b/src/support.js
index c2ffa45..4807ce2 100644 (file)
--- a/src/support.js
+++ b/src/support.js
@@ -4,10 +4,7 @@
 
        jQuery.support = {};
 
-       var root = document.documentElement,
-               script = document.createElement("script"),
-               div = document.createElement("div"),
-               id = "script" + jQuery.now();
+       var div = document.createElement("div");
 
        div.style.display = "none";
        div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
@@ -61,9 +58,10 @@
                optSelected: opt.selected,
 
                // Will be defined later
+               deleteExpando: true,
                optDisabled: false,
                checkClone: false,
-               scriptEval: false,
+               _scriptEval: null,
                noCloneEvent: true,
                boxModel: null,
                inlineBlockNeedsLayout: false,
@@ -76,22 +74,45 @@
        select.disabled = true;
        jQuery.support.optDisabled = !opt.disabled;
 
-       script.type = "text/javascript";
-       try {
-               script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
-       } catch(e) {}
+       jQuery.support.scriptEval = function() {
+               if ( jQuery.support._scriptEval === null ) {
+                       var root = document.documentElement,
+                               script = document.createElement("script"),
+                               id = "script" + jQuery.now();
+
+                       script.type = "text/javascript";
+                       try {
+                               script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+                       } catch(e) {}
+
+                       root.insertBefore( script, root.firstChild );
+
+                       // Make sure that the execution of code works by injecting a script
+                       // tag with appendChild/createTextNode
+                       // (IE doesn't support this, fails, and uses .text instead)
+                       if ( window[ id ] ) {
+                               jQuery.support._scriptEval = true;
+                               delete window[ id ];
+                       } else {
+                               jQuery.support._scriptEval = false;
+                       }
+
+                       root.removeChild( script );
+                       // release memory in IE
+                       root = script = id  = null;
+               }
 
-       root.insertBefore( script, root.firstChild );
+               return jQuery.support._scriptEval;
+       };
 
-       // Make sure that the execution of code works by injecting a script
-       // tag with appendChild/createTextNode
-       // (IE doesn't support this, fails, and uses .text instead)
-       if ( window[ id ] ) {
-               jQuery.support.scriptEval = true;
-               delete window[ id ];
-       }
+       // Test to see if it's possible to delete an expando from an element
+       // Fails in Internet Explorer
+       try {
+               delete div.test;
 
-       root.removeChild( script );
+       } catch(e) {
+               jQuery.support.deleteExpando = false;
+       }
 
        if ( div.attachEvent && div.fireEvent ) {
                div.attachEvent("onclick", function click() {
@@ -115,10 +136,16 @@
        // Figure out if the W3C box model works as expected
        // document.body must exist before we can do this
        jQuery(function() {
-               var div = document.createElement("div");
-               div.style.width = div.style.paddingLeft = "1px";
+               var div = document.createElement("div"),
+                       body = document.getElementsByTagName("body")[0];
 
-               document.body.appendChild( div );
+               // Frameset documents with no body should not run this code
+               if ( !body ) {
+                       return;
+               }
+
+               div.style.width = div.style.paddingLeft = "1px";
+               body.appendChild( div );
                jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
 
                if ( "zoom" in div.style ) {
@@ -137,7 +164,7 @@
                        jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
                }
 
-               div.innerHTML = "<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";
+               div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
                var tds = div.getElementsByTagName("td");
 
                // Check if table cells still have offsetWidth/Height when they are set
@@ -157,7 +184,7 @@
                jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
                div.innerHTML = "";
 
-               document.body.removeChild( div ).style.display = "none";
+               body.removeChild( div ).style.display = "none";
                div = tds = null;
        });
 
@@ -167,6 +194,14 @@
                var el = document.createElement("div");
                eventName = "on" + eventName;
 
+               // We only care about the case where non-standard event systems
+               // are used, namely in IE. Short-circuiting here helps us to
+               // avoid an eval call (in setAttribute) which can cause CSP
+               // to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+               if ( !el.attachEvent ) {
+                       return true;
+               }
+
                var isSupported = (eventName in el);
                if ( !isSupported ) {
                        el.setAttribute(eventName, "return;");
@@ -181,20 +216,6 @@
        jQuery.support.changeBubbles = eventSupported("change");
 
        // release memory in IE
-       root = script = div = all = a = null;
+       div = all = a = null;
 })();
-
-jQuery.props = {
-       "for": "htmlFor",
-       "class": "className",
-       readonly: "readOnly",
-       maxlength: "maxLength",
-       cellspacing: "cellSpacing",
-       rowspan: "rowSpan",
-       colspan: "colSpan",
-       tabindex: "tabIndex",
-       usemap: "useMap",
-       frameborder: "frameBorder"
-};
-
 })( jQuery );