aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMisko Hevery2010-07-20 17:13:31 -0700
committerMisko Hevery2010-07-20 17:13:31 -0700
commit719f6e15a052d50f30dcecc722193804a3d5eaed (patch)
tree7a12dc2a438610e14066c32ddbde9ef436452775 /src
parent0f4b068bd66cde63b222b114dbc1c5fec257a890 (diff)
downloadangular.js-719f6e15a052d50f30dcecc722193804a3d5eaed.tar.bz2
clean up error handling a bit.
Diffstat (limited to 'src')
-rw-r--r--src/Angular.js33
-rw-r--r--src/Scope.js2
2 files changed, 1 insertions, 34 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 8c0b591d..62747cf8 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -30,10 +30,6 @@ var consoleNode,
angularCallbacks = extensionMap(angular, 'callbacks'),
nodeName;
-function angularAlert(){
- log(arguments); window.alert.apply(window, arguments);
-}
-
function foreach(obj, iterator, context) {
var key;
if (obj) {
@@ -178,21 +174,6 @@ function indexOf(array, obj) {
return -1;
}
-function log(a, b, c){
- var console = window['console'];
- switch(arguments.length) {
- case 1:
- console['log'](a);
- break;
- case 2:
- console['log'](a, b);
- break;
- default:
- console['log'](a, b, c);
- break;
- }
-}
-
function error(a, b, c){
var console = window['console'];
switch(arguments.length) {
@@ -208,20 +189,6 @@ function error(a, b, c){
}
}
-function consoleLog(level, objs) {
- var log = document.createElement("div");
- log.className = level;
- var msg = "";
- var sep = "";
- for ( var i = 0; i < objs.length; i++) {
- var obj = objs[i];
- msg += sep + (typeof obj == 'string' ? obj : toJson(obj));
- sep = " ";
- }
- log.appendChild(document.createTextNode(msg));
- consoleNode.appendChild(log);
-}
-
function isLeafNode (node) {
if (node) {
switch (node.nodeName) {
diff --git a/src/Scope.js b/src/Scope.js
index f577f695..549cc944 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -147,7 +147,7 @@ function createScope(parent, services, existing) {
try {
return expressionCompile(expression).apply(instance, slice.call(arguments, 2, arguments.length));
} catch (e) {
- error(e);
+ (instance.$log || {error:error}).error(e);
if (isFunction(exceptionHandler)) {
exceptionHandler(e);
} else if (exceptionHandler) {