Update jQuery.data to use jQuery.noop for toJSON hack instead of an additional superf...

[jquery.git] / src / support.js

diff --git a/src/support.js b/src/support.js
index f502811..97b4a42 100644 (file)
--- a/src/support.js
+++ b/src/support.js
@@ -61,7 +61,6 @@
                deleteExpando: true,
                optDisabled: false,
                checkClone: false,
-               _scriptEval: null,
                noCloneEvent: true,
                boxModel: null,
                inlineBlockNeedsLayout: false,
@@ -74,13 +73,13 @@
        select.disabled = true;
        jQuery.support.optDisabled = !opt.disabled;
 
+       var _scriptEval = null;
        jQuery.support.scriptEval = function() {
-               if ( jQuery.support._scriptEval === null) {
+               if ( _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) {}
@@ -91,17 +90,18 @@
                        // tag with appendChild/createTextNode
                        // (IE doesn't support this, fails, and uses .text instead)
                        if ( window[ id ] ) {
-                               jQuery.support._scriptEval = true;
+                               _scriptEval = true;
                                delete window[ id ];
                        } else {
-                               jQuery.support._scriptEval = false;
+                               _scriptEval = false;
                        }
 
                        root.removeChild( script );
                        // release memory in IE
                        root = script = id  = null;
                }
-               return jQuery.support._scriptEval;
+
+               return _scriptEval;
        };
 
        // Test to see if it's possible to delete an expando from an element
@@ -113,7 +113,7 @@
                jQuery.support.deleteExpando = false;
        }
 
-       if ( div.attachEvent && div.fireEvent ) {
+       if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
                div.attachEvent("onclick", function click() {
                        // Cloning a node shouldn't copy over any
                        // bound event handlers (IE does this)
@@ -135,10 +135,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];
+
+               // Frameset documents with no body should not run this code
+               if ( !body ) {
+                       return;
+               }
 
-               document.body.appendChild( div );
+               div.style.width = div.style.paddingLeft = "1px";
+               body.appendChild( div );
                jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
 
                if ( "zoom" in div.style ) {
@@ -177,7 +183,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;
        });
 
@@ -187,6 +193,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;");