chore($sniffer): Remove remnants of separate documentMode handling

mgol · mgol · commit ac17dd30ad4c · 2014-10-08T18:44:50.000+02:00
Since msie is now set to document.documentMode, it's not necessary to keep
the documentMode in a separate property.
diff --git a/src/ng/sce.js b/src/ng/sce.js
@@ -729,9 +729,9 @@ function $SceProvider() {
 
   this.$get = ['$parse', '$sniffer', '$sceDelegate', function(
                 $parse,   $sniffer,   $sceDelegate) {
-    // Prereq: Ensure that we're not running in IE8 quirks mode.  In that mode, IE allows
+    // Prereq: Ensure that we're not running in IE9/IE10/IE11 quirks mode.  In that mode, IE allows
     // the "expression(javascript expression)" syntax which is insecure.
-    if (enabled && $sniffer.msie && $sniffer.msieDocumentMode < 8) {
+    if (enabled && $sniffer.msie < 8) {
       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/src/ng/sniffer.js b/src/ng/sniffer.js
@@ -22,7 +22,6 @@ function $SnifferProvider() {
           int((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
         boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
         document = $document[0] || {},
-        documentMode = document.documentMode,
         vendorPrefix,
         vendorRegex = /^(Moz|webkit|O|ms)(?=[A-Z])/,
         bodyStyle = document.body && document.body.style,
@@ -65,9 +64,7 @@ function $SnifferProvider() {
       // jshint -W018
       history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee),
       // jshint +W018
-      hashchange: 'onhashchange' in $window &&
-                  // IE8 compatible mode lies
-                  (!documentMode || documentMode > 7),
+      hashchange: 'onhashchange' in $window && (!msie || msie > 7),
       hasEvent: function(event) {
         // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
         // it. In particular the event is not fired when backspace or delete key are pressed or
@@ -86,8 +83,7 @@ function $SnifferProvider() {
       transitions : transitions,
       animations : animations,
       android: android,
-      msie : msie,
-      msieDocumentMode: documentMode
+      msie : msie
     };
   }];
 }
diff --git a/test/ng/sceSpecs.js b/test/ng/sceSpecs.js
@@ -30,8 +30,7 @@ describe('SCE', function() {
     function runTest(enabled, documentMode, expectException) {
       module(function($provide) {
         $provide.value('$sniffer', {
-          msie: documentMode,
-          msieDocumentMode: documentMode
+          msie: documentMode
         });
         $provide.value('$sceDelegate', {trustAs: null, valueOf: null, getTrusted: null});
       });
diff --git a/test/ng/snifferSpec.js b/test/ng/snifferSpec.js
@@ -354,8 +354,8 @@ describe('$sniffer', function() {
     }
   }));
 
-  it('should return document.documentMode as msieDocumentMode', function() {
+  it('should return document.documentMode as msie', function() {
     var someDocumentMode = 123;
-    expect(sniffer({}, {documentMode: someDocumentMode}).msieDocumentMode).toBe(someDocumentMode);
+    expect(sniffer({}, {documentMode: someDocumentMode}).msie).toBe(someDocumentMode);
   });
 });
