chore($sniffer): Remove $sniffer.msie & $sniffer.msieDocumentMode

mgol · mgol · commit 1d9590423164 · 2014-10-08T20:18:38.000+02:00
Since msie is now set to document.documentMode, it's not necessary to keep the documentMode in a separate property. Also, msie is a variable global to Angular source so there's no need to replicate it in $sniffer. Closes gh-9496
diff --git a/src/ng/sce.js b/src/ng/sce.js
@@ -727,13 +727,13 @@ function $SceProvider() {
    * sce.js and sceSpecs.js would need to be aware of this detail.
    */
 
-  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
+  this.$get = ['$document', '$parse', '$sceDelegate', function(
+                $document,   $parse,   $sceDelegate) {
+    // Prereq: Ensure that we're not running in IE<11 quirks mode.  In that mode, IE < 11 allows
     // the "expression(javascript expression)" syntax which is insecure.
-    if (enabled && $sniffer.msie && $sniffer.msieDocumentMode < 8) {
+    if (enabled && $document[0].documentMode < 8) {
       throw $sceMinErr('iequirks',
-        'Strict Contextual Escaping does not support Internet Explorer version < 9 in quirks ' +
+        'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' +
         'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
         'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
     }
diff --git a/src/ng/sniffer.js b/src/ng/sniffer.js
@@ -21,7 +21,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,
@@ -81,9 +80,7 @@ function $SnifferProvider() {
       vendorPrefix: vendorPrefix,
       transitions : transitions,
       animations : animations,
-      android: android,
-      msie : msie,
-      msieDocumentMode: documentMode
+      android: android
     };
   }];
 }
diff --git a/test/ng/locationSpec.js b/test/ng/locationSpec.js
@@ -18,7 +18,7 @@ describe('$location', function() {
     var urlParsingNodePlaceholder;
 
     beforeEach(inject(function ($sniffer) {
-      if ($sniffer.msie) return;
+      if (msie) return;
 
       urlParsingNodePlaceholder = urlParsingNode;
 
@@ -38,7 +38,7 @@ describe('$location', function() {
     }));
 
     afterEach(inject(function ($sniffer) {
-      if ($sniffer.msie) return;
+      if (msie) return;
       //reset urlParsingNode
       urlParsingNode = urlParsingNodePlaceholder;
     }));
diff --git a/test/ng/sceSpecs.js b/test/ng/sceSpecs.js
@@ -26,12 +26,12 @@ describe('SCE', function() {
     }));
   });
 
-  describe('IE8 quirks mode', function() {
+  describe('IE<11 quirks mode', function() {
     function runTest(enabled, documentMode, expectException) {
       module(function($provide) {
-        $provide.value('$sniffer', {
-          msie: documentMode,
-          msieDocumentMode: documentMode
+        $provide.decorator('$document', function ($delegate) {
+          $delegate[0].documentMode = documentMode;
+          return $delegate;
         });
         $provide.value('$sceDelegate', {trustAs: null, valueOf: null, getTrusted: null});
       });
@@ -47,7 +47,7 @@ describe('SCE', function() {
         if (expectException) {
           expect(constructSce).toThrowMinErr(
             '$sce', '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 ' +
+              'version < 11 in quirks mode.  You can fix this by adding the text <!doctype html> to ' +
               'the top of your HTML document.  See http://docs.angularjs.org/api/ng.$sce for more ' +
               'information.');
         } else {
diff --git a/test/ng/snifferSpec.js b/test/ng/snifferSpec.js
@@ -332,16 +332,4 @@ describe('$sniffer', function() {
       expect($sniffer.android).toBe(2);
     });
   });
-
-  it('should return the internal msie flag', inject(function($sniffer) {
-    expect(isNaN($sniffer.msie)).toBe(isNaN(msie));
-    if (msie) {
-      expect($sniffer.msie).toBe(msie);
-    }
-  }));
-
-  it('should return document.documentMode as msieDocumentMode', function() {
-    var someDocumentMode = 123;
-    expect(sniffer({}, {documentMode: someDocumentMode}).msieDocumentMode).toBe(someDocumentMode);
-  });
 });
