aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIgor Minar2013-08-07 11:20:51 -0700
committerIgor Minar2013-08-07 11:21:34 -0700
commitd1cdd4d026968993db9d0130390bb5138b942224 (patch)
treeeb0a4ce921416b1244c1c9b5b8d961251f621146 /src
parentaf731354b0b600f87f15e1573e64a7f7acc70f3d (diff)
downloadangular.js-d1cdd4d026968993db9d0130390bb5138b942224.tar.bz2
chore(dump): fix our karma.dump bridge
previously it didn't work for dumping multiple objects
Diffstat (limited to 'src')
-rw-r--r--src/ng/rootScope.js4
-rw-r--r--src/ngMock/angular-mocks.js1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
index 2e76d6ee..d94a621d 100644
--- a/src/ng/rootScope.js
+++ b/src/ng/rootScope.js
@@ -577,7 +577,7 @@ function $RootScopeProvider(){
*
* @description
* Broadcasted when a scope and its children are being destroyed.
- *
+ *
* Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
* clean up DOM bindings before an element is removed from the DOM.
*/
@@ -601,7 +601,7 @@ function $RootScopeProvider(){
* Just before a scope is destroyed a `$destroy` event is broadcasted on this scope.
* Application code can register a `$destroy` event handler that will give it chance to
* perform any necessary cleanup.
- *
+ *
* Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
* clean up DOM bindings before an element is removed from the DOM.
*/
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index 36bf982f..ff2d79d4 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -787,6 +787,7 @@ angular.mock.dump = function(object) {
} else if (object instanceof Error) {
out = object.stack || ('' + object.name + ': ' + object.message);
} else {
+ // TODO(i): this prevents methods to be logged, we should have a better way to serialize objects
out = angular.toJson(object, true);
}
} else {