diff options
author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /node_modules/montage/core/exception.js | |
parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
Diffstat (limited to 'node_modules/montage/core/exception.js')
-rwxr-xr-x | node_modules/montage/core/exception.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/core/exception.js b/node_modules/montage/core/exception.js index 4cca326d..e77afeb4 100755 --- a/node_modules/montage/core/exception.js +++ b/node_modules/montage/core/exception.js | |||
@@ -88,7 +88,7 @@ var Exception = exports.Exception = Montage.create(Montage,/** @lends module:mon | |||
88 | toString: { | 88 | toString: { |
89 | enumerable: false, | 89 | enumerable: false, |
90 | value: function() { | 90 | value: function() { |
91 | return "Exception: " + (message !== null ? message + " " : null) + (target !== null ? target + " " : null) + (method !== null ? method + " " : null); | 91 | return "Exception: " + (this.message !== null ? this.message + " " : null) + (this.target !== null ? this.target + " " : null) + (this.method !== null ? this.method + " " : null); |
92 | } | 92 | } |
93 | } | 93 | } |
94 | 94 | ||