WIP: single getter/setter definition for IE8 and modern browsers

Author: jeffbcross

test/ng/browserSpecs.js

@@ -46,61 +46,37 @@ function MockWindow(options) {
     });
   };
 
-  this.location = {
-    replace: function(url) {
-      locationHref = url;
+  //IE8 hack. defineProperty doesn't work with POJS, just with certain DOM elements
+  this.location = document.createElement('div');
+  this.location.href = {};
+  this.location.hash = {};
+  this.location.replace = function(url) {
+    locationHref = url;
+    mockWindow.history.state = null;
+  };
+  Object.defineProperty(this.location, 'href', {
+    enumerable: false,
+    configurable: true,
+    set: function(value) {
+      locationHref = value;
       mockWindow.history.state = null;
+      historyEntriesLength++;
+    },
+    get: function() {
+      return locationHref;
     }
-  };
-  dump(msie);
-  if (!msie || msie > 8) {
-    eval([
-      "this.location = {",
-        "get href() {",
-          "return locationHref;",
-        "},",
-        "set href(value) {",
-          "locationHref = value;",
-          "mockWindow.history.state = null;",
-          "historyEntriesLength++;",
-        "},",
-        "get hash() {",
-          "return getHash(locationHref);",
-        "},",
-        "set hash(value) {",
-          "locationHref = stripHash(locationHref) + '#' + value;",
-        "},",
-        "replace: function(url) {",
-          "locationHref = url;",
-          "mockWindow.history.state = null;",
-        "}",
-     "};"
-    ].join('\n'));
-  }
-  else {
-    eval([
-      "this.location={",
-        "replace: function(url) {",
-          "locationHref = url;",
-          "mockWindow.history.state = null;",
-          "}",
-      "};",
-      "this.location.__defineGetter__('href', function getHref() {",
-        "return locationHref;",
-      "});",
-      "this.location.__defineSetter__('href', function setHref(value) {",
-        "locationHref = value;",
-        "mockWindow.history.state = null;",
-        "historyEntriesLength++;",
-      "});",
-      "this.location.__defineGetter__('hash', function getHash() {",
-        "return getHash(locationHref);",
-      "});",
-      "this.location.__defineSetter__('hash', function setHash(value) {",
-        "locationHref = stripHash(locationHref) + '#' + value;",
-      "});"
-    ].join('\n'));
-  }
+  });
+
+  Object.defineProperty(this.location, 'hash', {
+    enumerable: false,
+    configurable: true,
+    set: function(value) {
+      locationHref = stripHash(locationHref) + '#' + value;
+    },
+    get: function() {
+      return getHash(locationHref);
+    }
+  });
 
   this.history = {
     replaceState: noop,
@@ -151,7 +127,6 @@ describe('browser', function() {
                    warn: function() { logs.warn.push(slice.call(arguments)); },
                    info: function() { logs.info.push(slice.call(arguments)); },
                    error: function() { logs.error.push(slice.call(arguments)); }};
-
     browser = new Browser(fakeWindow, fakeDocument, fakeLog, sniffer);
   });