Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/document/document-html.js
	js/document/templates/app/main.js
	js/panels/Panel.reel/Panel.js
	node_modules/montage/ui/native-control.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 9 insertions, 5 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 8b82c40f..56f4e3d3 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -36,7 +36,7 @@ exports.HtmlDocument = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
     exclusionList: {
-        value: ["HTML", "BODY", "NINJA-CONTENT"]
+        value: ["HTML", "BODY", "NINJA-CONTENT", "NINJA-VIEWPORT"]
     },
     ////////////////////////////////////////////////////////////////////
         //
@@ -108,6 +108,12 @@ exports.HtmlDocument = Montage.create(Component, {
     handleViewReady: {
         value: function(mObjects) {
             this.model.mObjects = mObjects;
+            // TODO: Find a better way to initialize this property
+            // Assign the domContainer to be the document root on open
+            if(typeof this.model.domContainer !== "undefined") {
+                this.model.domContainer = this.model.documentRoot;
+            }
+
             //Making callback after view is loaded
             this.loaded.callback.call(this.loaded.context, this);
         }
@@ -116,10 +122,8 @@ exports.HtmlDocument = Montage.create(Component, {
         //
         closeDocument: {
                 value: function (context, callback) {
-                        //Closing document and getting outcome
-                        var closed = this.model.close(null);
-                        //Making callback if specified
-                        if (callback) callback.call(context, this);
+                        //Closing document (sending null to close all views)
+                        this.model.close(null, function () {if (callback) callback.call(context, this);}.bind(this));
                 }
         },
     ////////////////////////////////////////////////////////////////////