Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

6 files changed, 114 insertions, 34 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 04565753..b9c8e797 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"]
     },
     ////////////////////////////////////////////////////////////////////
         //
@@ -107,6 +107,12 @@ exports.HtmlDocument = Montage.create(Component, {
     },
     handleViewReady: {
         value: function() {
+            // 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);
         }
@@ -115,10 +121,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));
                 }
         },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index 50fad1c3..c5b46c3a 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -145,6 +145,29 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                                         template.file.content.document.body.setAttribute(template.body.attributes[n].name, template.body.attributes[n].value);
                                 }                               
                         }
+                        //
+            if(template.template) {
+                //
+                // TODO - Need to handle banner and animation templates.
+                //Copying attributes to maintain same properties as <ninja-content>
+                var ninjaContentTagMem = template.document.getElementsByTagName('ninja-content')[0], ninjaContentTagDoc = template.file.content.document.getElementsByTagName('ninja-content')[0];
+                if (ninjaContentTagMem && ninjaContentTagMem.getAttribute('data-ninja-style') !== null) {
+                    ninjaContentTagDoc.setAttribute('style', ninjaContentTagMem.getAttribute('data-ninja-style'));
+                    ninjaContentTagDoc.removeAttribute('data-ninja-style');
+                } else if (ninjaContentTagMem && ninjaContentTagMem.getAttribute('data-ninja-style') === null) {
+                    ninjaContentTagDoc.removeAttribute('style');
+                    ninjaContentTagDoc.removeAttribute('data-ninja-style');
+                }
+            } else {
+                if (template.body && template.body.getAttribute('data-ninja-style') !== null) {
+                    template.file.content.document.body.setAttribute('style', template.body.getAttribute('data-ninja-style'));
+                    template.file.content.document.body.removeAttribute('data-ninja-style');
+                } else if (template.body && template.body.getAttribute('data-ninja-style') === null) {
+                    template.file.content.document.body.removeAttribute('style');
+                    template.file.content.document.body.removeAttribute('data-ninja-style');
+                }
+            }
+
                         wipeAttributes(template.file.content.document.head);
             //Copying attributes to maintain same properties as the <head>
                         for (var m in template.document.head.attributes) {
@@ -155,6 +178,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             //Copying attributes to maintain same properties as the <html>
                         var htmlTagMem = template.document.getElementsByTagName('html')[0], htmlTagDoc = template.file.content.document.getElementsByTagName('html')[0];
                         wipeAttributes(htmlTagDoc);
+                        //
                         for (var m in htmlTagMem.attributes) {
                                 if (htmlTagMem.attributes[m].value) {
                                         if (htmlTagMem.attributes[m].value.replace(/montage-app-bootstrapping/gi, '').length>0) {
@@ -162,10 +186,19 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                                         }
                                 }
                         }
+                        //
+                        if (htmlTagMem && htmlTagMem.getAttribute('data-ninja-style') !== null) {
+                        htmlTagDoc.setAttribute('style', htmlTagMem.getAttribute('data-ninja-style'));
+                                htmlTagDoc.removeAttribute('data-ninja-style');
+                        } else if (htmlTagMem && htmlTagMem.getAttribute('data-ninja-style') === null) {
+                                htmlTagDoc.removeAttribute('style');
+                                htmlTagDoc.removeAttribute('data-ninja-style');
+                        }
             //Getting list of current nodes (Ninja DOM)
             presentNodes = template.file.content.document.getElementsByTagName('*');
             //Looping through nodes to determine origin and removing if not inserted by Ninja
             for (var n in presentNodes) {
+                        //
                         if (presentNodes[n].getAttribute && presentNodes[n].getAttribute('data-ninja-node') === null) {
                                 toremovetags.push(presentNodes[n]);     
                         } else if (presentNodes[n].getAttribute && presentNodes[n].getAttribute('data-ninja-node') !== null) {
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 5fa06259..8ff52132 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -6,8 +6,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =   require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component;
+var Montage =           require("montage/core/core").Montage,
+        Component =     require("montage/ui/component").Component,
+        NinjaPrompt =   require("js/components/prompt.reel").NinjaPrompt;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.BaseDocumentModel = Montage.create(Component, {
@@ -65,6 +66,9 @@ exports.BaseDocumentModel = Montage.create(Component, {
     _selection: {
         value: []
     },
+    domContainer: {
+        value: null
+    },
     ////////////////////////////////////////////////////////////////////
     //
     selection: {
@@ -264,30 +268,59 @@ exports.BaseDocumentModel = Montage.create(Component, {
                         if (this.callback) this.callback(result);
                 }
         },
+        ////////////////////////////////////////////////////////////////////
+        //
+        handleSavePrompt: {
+                value: function (continueToClose, callback) {
+                        //TODO: Perhaps add logic to save the file is the user wants
+                        if (continueToClose) {
+                                if (callback) callback();
+                        } else {
+                                //User canceled
+                                //this.saveAll(null, callback);
+                        }
+                }
+        },
     ////////////////////////////////////////////////////////////////////
         //TODO: Implement better logic to include different views on single document
         close: {
         value: function (view, callback) {
-                //Outcome of close (pending on save logic)
-                var success;
-                //
+                //Checking if files needs to be saved to avoid losing data
                 if (this.needsSave) {
-                        //TODO: Prompt user to save or lose data
+                        //Creating prompt to ask user to save the file
+                        var prompt = NinjaPrompt.create();
+                        prompt.initialize('confirm', {message: 'Do you want to save the changes you made in the document '+this.file.name+'?\n\nYour changes will be lost if you do not save them.'}, function (result){this.handleSavePrompt(result, callback);}.bind(this));
+                        //Showing the prompt, it will make callback with user input
+                        prompt.show();
                 } else {
-                        //Close file
-                        success = true;
-                }
-                //Checking for view mode to close
-                if (this.views.design && (!view || view === 'design')) {
-                        //TODO: Create a destroy method, this is messy
-                        this.views.design.pauseAndStopVideos();
-                        this.parentContainer.removeChild(this.views.design.iframe);
-                        this.views.design = null;
+                        //TODO: Add support for other views
+                        if (!view || view === 'design') {
+                                this.closeView('design');
+                        }
+                        //Making callback
+                        if (callback) callback();
                 }
-                //Returning result of operation
-                return success;
+                
         }
-    }
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        closeView: {
+                value: function (view) {
+                        //Checking for view mode to close
+                switch (view.toLowerCase()) {
+                        case 'design':
+                                //TODO: Make into clean method in the design view
+                                this.views.design.pauseAndStopVideos();