aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Angular.js3
-rw-r--r--src/JSON.js15
2 files changed, 5 insertions, 13 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 1265ad9f..57c86417 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -83,9 +83,6 @@ var $boolean = 'boolean',
slice = [].slice,
push = [].push,
toString = Object.prototype.toString,
- error = window[$console]
- ? bind(window[$console], window[$console]['error'] || noop)
- : noop,
/** @name angular */
angular = window.angular || (window.angular = {}),
diff --git a/src/JSON.js b/src/JSON.js
index db145879..983a53e8 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -37,17 +37,12 @@ function fromJson(json, useNative) {
var obj;
- try {
- if (useNative && window.JSON && window.JSON.parse) {
- obj = JSON.parse(json);
- } else {
- obj = parseJson(json, true)();
- }
- return transformDates(obj);
- } catch (e) {
- error("fromJson error: ", json, e);
- throw e;
+ if (useNative && window.JSON && window.JSON.parse) {
+ obj = JSON.parse(json);
+ } else {
+ obj = parseJson(json, true)();
}
+ return transformDates(obj);
// TODO make forEach optionally recursive and remove this function
// TODO(misko): remove this once the $http service is checked in.