diff options
| author | justinrknowles | 2013-08-18 14:01:34 -0400 |
|---|---|---|
| committer | Igor Minar | 2013-08-21 01:38:39 -0700 |
| commit | 637c9b1611c5a75a42048ee1c591521c7031751a (patch) | |
| tree | 9d30973534566743a12e96cbb5b7a0f337c9a759 | |
| parent | ad77d67cb7e1bc473899b99251108991f2c76f7f (diff) | |
| download | angular.js-637c9b1611c5a75a42048ee1c591521c7031751a.tar.bz2 | |
fix($sce): allow IE7 standards mode to pass non-quirks mode test
Changes documentMode test version to 7 in order to support IE 8 in IE 7 standards
mode while still protecting against quirks mode.
documentMode returns the following values:
5 - quirks mode,
7 - IE 7 standards mode,
8 - IE 8 standards mode.
Closes #3633
Closes #3646
| -rw-r--r-- | src/ng/sce.js | 2 | ||||
| -rw-r--r-- | test/ng/sceSpecs.js | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ng/sce.js b/src/ng/sce.js index 60356097..68b97f61 100644 --- a/src/ng/sce.js +++ b/src/ng/sce.js @@ -620,7 +620,7 @@ function $SceProvider() { // the "expression(javascript expression)" syntax which is insecure. if (enabled && msie) { var documentMode = $document[0].documentMode; - if (documentMode !== undefined && documentMode < 8) { + if (documentMode !== undefined && documentMode < 7) { throw $sceMinErr('iequirks', 'Strict Contextual Escaping does not support Internet Explorer version < 9 in quirks ' + 'mode. You can fix this by adding the text <!doctype html> to the top of your HTML ' + diff --git a/test/ng/sceSpecs.js b/test/ng/sceSpecs.js index 75c1fbaa..c8a051e8 100644 --- a/test/ng/sceSpecs.js +++ b/test/ng/sceSpecs.js @@ -58,7 +58,11 @@ describe('SCE', function() { } it('should throw an exception when sce is enabled in quirks mode', function() { - runTest(true, 7, true); + runTest(true, 5, true); + }); + + it('should NOT throw an exception when sce is enabled and in IE7 standards mode', function() { + runTest(true, 7, false); }); it('should NOT throw an exception when sce is enabled and in standards mode', function() { @@ -70,6 +74,10 @@ describe('SCE', function() { }); it('should NOT throw an exception when sce is disabled even when in quirks mode', function() { + runTest(false, 5, false); + }); + + it('should NOT throw an exception when sce is disabled and in IE7 standards mode', function() { runTest(false, 7, false); }); |