aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2012-11-15 00:49:19 +0100
committerIgor Minar2012-11-15 01:46:58 +0100
commitaf7e0bd0a7c286667c526cb7e0c733d3ee5f17fd (patch)
tree9831b4235d5a345aac85fbc2561da3b237a52479
parentbd524fc4e5fc0feffe85632a7a6560da6bd9b762 (diff)
downloadangular.js-af7e0bd0a7c286667c526cb7e0c733d3ee5f17fd.tar.bz2
fix(CSP): update to the latest CSP api
window.SecurityPolicy.isActive() is now window.securityPolicy.isActive since this is available only in Chrome Canary which has already been updated, we can safely make this change without worrying about backwards compatilibty. Closes #1577
-rw-r--r--src/ng/sniffer.js2
-rw-r--r--test/ng/snifferSpec.js6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ng/sniffer.js b/src/ng/sniffer.js
index d2c43c25..9342fbd5 100644
--- a/src/ng/sniffer.js
+++ b/src/ng/sniffer.js
@@ -41,7 +41,7 @@ function $SnifferProvider() {
return eventSupport[event];
},
- csp: document.SecurityPolicy ? document.SecurityPolicy.isActive() : false
+ csp: document.securityPolicy ? document.securityPolicy.isActive : false
};
}];
}
diff --git a/test/ng/snifferSpec.js b/test/ng/snifferSpec.js
index 8d21a23c..2369deaf 100644
--- a/test/ng/snifferSpec.js
+++ b/test/ng/snifferSpec.js
@@ -82,14 +82,14 @@ describe('$sniffer', function() {
describe('csp', function() {
- it('should be false if document.SecurityPolicy.isActive not available', function() {
+ it('should be false if document.securityPolicy.isActive not available', function() {
expect(sniffer({}, {}).csp).toBe(false);
});
- it('should use document.SecurityPolicy.isActive() if available', function() {
+ it('should use document.securityPolicy.isActive if available', function() {
var createDocumentWithCSP = function(csp) {
- return {SecurityPolicy: {isActive: function() {return csp;}}};
+ return {securityPolicy: {isActive: csp}};
};
expect(sniffer({}, createDocumentWithCSP(false)).csp).toBe(false);