aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMisko Hevery2010-01-25 23:49:52 -0800
committerMisko Hevery2010-01-25 23:49:52 -0800
commita2540fd581f35e8f79240d827d2252da5798c3a2 (patch)
tree35d814703e9edbb2c36d0864b2f8a317bba4d830 /src
parentba9eef40cfbb6cd969d566b43fd9129642d01351 (diff)
downloadangular.js-a2540fd581f35e8f79240d827d2252da5798c3a2.tar.bz2
fixes to make it pass on IE
Diffstat (limited to 'src')
-rw-r--r--src/API.js2
-rw-r--r--src/Angular.js3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/API.js b/src/API.js
index d795f4c3..ce690ad1 100644
--- a/src/API.js
+++ b/src/API.js
@@ -319,5 +319,7 @@ defineApi('Object', [angularGlobal, angularCollection, angularObject],
['keys', 'values']);
defineApi('String', [angularGlobal, angularString], []);
defineApi('Date', [angularGlobal, angularDate], []);
+//IE bug
+angular['Date']['toString'] = angularDate['toString'];
defineApi('Function', [angularGlobal, angularCollection, angularFunction],
['bind', 'bindAll', 'delay', 'defer', 'wrap', 'compose']);
diff --git a/src/Angular.js b/src/Angular.js
index bfbe8ee9..f06562da 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -20,7 +20,8 @@ if (typeof Node == 'undefined') {
function noop() {}
if (!window['console']) window['console']={'log':noop, 'error':noop};
-var consoleNode, jQuery, msie,
+var consoleNode, msie,
+ jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
foreach = _.each,
extend = _.extend,
angular = window['angular'] || (window['angular'] = {}),