Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

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

2 files changed, 22 insertions, 6 deletions

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 5f2a5893..649539ea 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -93,13 +93,21 @@ exports.BaseDocumentModel = Montage.create(Component, {
                         //Currently only supporting current browser (Chrome, obviously)
                         switch (this.browser) {
                                 case 'chrome':
-                                        window.open(this.url);
+                                        if (this.template && (this.template.type === 'banner' || this.template.type === 'animation')) {
+                                                window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
+                                        } else {
+                                                window.open(this.url);
+                                        }
                                         break;
                         default:
-                                        window.open(this.url);
+                                        if (this.template.type === 'banner' || this.template.type === 'animation') {
+                                                window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
+                                        } else {
+                                                window.open(this.url);
+                                        }
                                         break;
                         }
-                }.bind({browser: browser, url: url}));
+                }.bind({browser: browser, url: url, template: this.fileTemplate}));
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -141,7 +149,8 @@ exports.BaseDocumentModel = Montage.create(Component, {
                                 template: this.fileTemplate,
                                 document: this.views.design.iframe.contentWindow.document,
                                 head: this.views.design.iframe.contentWindow.document.head,
-                                body: this.views.design.iframe.contentWindow.document.body
+                                body: this.views.design.iframe.contentWindow.document.body,
+                                mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
                         }, callback.bind(this));
                 } else {
                         //TODO: Add logic to save code view data
@@ -169,7 +178,8 @@ exports.BaseDocumentModel = Montage.create(Component, {
                                 template: this.fileTemplate,
                                 document: this.views.design.iframe.contentWindow.document,
                                 head: this.views.design.iframe.contentWindow.document.head,
-                                body: this.views.design.iframe.contentWindow.document.body
+                                body: this.views.design.iframe.contentWindow.document.body,
+                                mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
                         }, callback.bind(this));
                 } else {
                         //TODO: Add logic to save code view data
@@ -206,10 +216,11 @@ exports.BaseDocumentModel = Montage.create(Component, {
                 if (this.views.design && (!view || view === 'design')) {
                         //
                         this.parentContainer.removeChild(this.views.design.iframe);
+                this.views.design.pauseAndStopVideos();
                         this.views.design = null;
                 }
                 //
-                if (callback) callback(success);
+                return success;
         }
     }
         ////////////////////////////////////////////////////////////////////
diff --git a/js/document/models/html.js b/js/document/models/html.js
index b57ff832..67457863 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -17,6 +17,11 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         hasTemplate: {
         value: false
     },
+    ////////////////////////////////////////////////////////////////////
+    //
+    selection: {
+        value: []
+    },
         ////////////////////////////////////////////////////////////////////
         //
     draw3DGrid: {