aboutsummaryrefslogtreecommitdiff
path: root/js/document/document-html.js
diff options
context:
space:
mode:
authorhwc4872012-06-13 10:17:07 -0700
committerhwc4872012-06-13 10:17:07 -0700
commiteea0703ca3b7f066a9d685ce09905d4860fa082d (patch)
treef0000ae8469a9e551f629c744251e6a688bbec4c /js/document/document-html.js
parent1fe66f1a89ac949dee44ae881556901a8bf98bba (diff)
parent5a7774f6769a7a682e21bafe0e57007668f16153 (diff)
downloadninja-eea0703ca3b7f066a9d685ce09905d4860fa082d.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/io/system/ninjalibrary.json
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-xjs/document/document-html.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 15f88d09..aded9241 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -121,10 +121,8 @@ exports.HtmlDocument = Montage.create(Component, {
121 // 121 //
122 closeDocument: { 122 closeDocument: {
123 value: function (context, callback) { 123 value: function (context, callback) {
124 //Closing document and getting outcome 124 //Closing document (sending null to close all views)
125 var closed = this.model.close(null); 125 this.model.close(null, function () {if (callback) callback.call(context, this);}.bind(this));
126 //Making callback if specified
127 if (callback) callback.call(context, this);
128 } 126 }
129 }, 127 },
130 //////////////////////////////////////////////////////////////////// 128 ////////////////////////////////////////////////////////////////////