Merge branch 'refs/heads/master' into binding

Conflicts:
	js/document/models/html.js
	js/document/views/design.js
	js/ninja.reel/ninja.js

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

1 files changed, 84 insertions, 49 deletions

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 9f5a65bd..5f753bd3 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -4,10 +4,11 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-var Montage = require("montage/core/core").Montage,
-    Component   = require("montage/ui/component").Component,
-    UndoManager = require("montage/core/undo-manager").UndoManager,
-    AppData     = require("js/data/appdata").AppData;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    UndoManager =       require("montage/core/undo-manager").UndoManager,
+    AppData =           require("js/data/appdata").AppData,
+    Popup =             require("js/components/popup.reel").Popup;
 
 var matrix = require("js/lib/math/matrix");
 var NjUtils = require("js/lib/NJUtils").NJUtils;
@@ -18,7 +19,26 @@ exports.Ninja = Montage.create(Component, {
         value: null
     },
 
-    _workspaceMode: {
+    toolsData: {
+        value: null
+    },
+
+
+    documentList: {
+        value: null
+    },
+
+    currentDocument: {
+        get: function() {
+            if(this.documentList.selectedObjects) {
+                return this.documentList.selectedObjects[0];
+            } else {
+                return null;
+            }
+        }
+    },
+
+        _workspaceMode: {
         value: null
     },
 
@@ -37,16 +57,6 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
-    toolsData: { value: null },
-    appData:    { value: AppData },
-
-    currentDocument: {
-        value: null
-    },
-
-    _isResizing: {
-        value: null
-    },
     _resizedHeight : {
         value: 0
     },
@@ -74,9 +84,10 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
-    _resizedWidth : {
+    _resizedWidth: {
         value: 0
     },
+
     _width: {
         value: null
     },
@@ -148,7 +159,6 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
-
     selectedElements: {
         value: []
     },
@@ -194,27 +204,53 @@ exports.Ninja = Montage.create(Component, {
 
             this.eventManager.addEventListener("selectTool", this, false);
             this.eventManager.addEventListener("selectSubTool", this, false);
-            this.eventManager.addEventListener("onOpenDocument", this, false);
-            this.eventManager.addEventListener("onSwitchDocument", this, false);
 
             this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false);
             this.addPropertyChangeListener("appModel.chromePreview", this.executeChromePreview, false);
             this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false);
-
-            NJevent("appLoading");
         }
     },
     
     
     ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
         //TODO: Expand method to allow other browsers for preview
     executeChromePreview: {
         value: function () {
-                this.application.ninja.documentController.activeDocument.model.browserPreview('chrome');
+                //TODO: Make into proper component
+                this.saveOperationScreen = {};
+                this._saveOperationPopup = {};
+                //Show
+                this.saveOperationScreen.show = function (ctxt) {
+                        //
+                        ctxt._saveOperationPopup.blackout = document.createElement('div');
+                        ctxt._saveOperationPopup.blackout.style.width = '100%';
+                        ctxt._saveOperationPopup.blackout.style.height = '100%';
+                        ctxt._saveOperationPopup.blackout.style.background = 'rgba(0,0,0,0.8)'; //'-webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,.65) 0%, rgba(0,0,0,0.8) 80%)';
+                        ctxt.application.ninja.popupManager.addPopup(ctxt._saveOperationPopup.blackout);
+                };
+                //Hide
+                this.saveOperationScreen.hide = function (ctxt) {
+                        ctxt.application.ninja.popupManager.removePopup(ctxt._saveOperationPopup.blackout);
+                };
+                //
+                this.currentDocument.model.browserPreview('chrome', this.saveOperationScreen, this);
         }
     },
         ////////////////////////////////////////////////////////////////////
         
+        //TODO: Make into proper component
+        _saveOperationPopup: {
+                value: null
+        },
+        //TODO: Make into proper component
+        saveOperationScreen: {
+                value: null
+        },
+        
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+        
         
     handleResize: {
         value: function() {
@@ -295,31 +331,40 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
-    handleOnOpenDocument: {
-        value: function(event) {
-            this.currentDocument = event.detail;
+    openDocument: {
+        value: function(doc) {
+            this.documentList.content.push(doc);
+            // This is not needed with the latest 0.10 montage.
+            // TODO: Remove this when integrating the next montage
+            this.documentList.selectedObjects = [doc];
 
-            if(this.currentDocument.model.documentRoot) {
-                this.currentSelectedContainer = this.currentDocument.model.documentRoot;
-            } else {
-                alert("The current document has not loaded yet");
-                return;
+            if(doc.currentView === "design") {
+                // TODO: Bind directly to the model of the document in components instead of this property
+                this._currentSelectedContainer = null;
+                this.currentSelectedContainer = doc.model.documentRoot;
             }
-
-            this.appModel.show3dGrid = this.currentDocument.draw3DGrid;
-            NJevent("openDocument");
         }
     },
 
-    handleOnSwitchDocument: {
-        value: function() {
-            this.currentDocument = this.documentController.activeDocument;
+    closeFile: {
+        value: function(document) {
+            var doc = this.documentList.content[this.documentList.content.indexOf(document)], activeDocument;
 
-            if(this.currentDocument.model.documentRoot) {
-                this._currentSelectedContainer = this.selectionController._selectionContainer = this.currentDocument.model.documentRoot;
+            if(this.documentList.selectedObjects[0] !== doc) {
+                activeDocument = this.documentList.selectedObjects[0];
+            } else {
+                activeDocument = null;
             }
 
-            NJevent("switchDocument");
+            this.documentList.removeObjects(doc);
+
+            if(activeDocument) {
+                this.documentList.selectedObjects = [activeDocument];
+            } else {
+                if(this.documentList.content.length) {
+                    this.documentList.selectedObjects = this.documentList.content[0];
+                }
+            }
         }
     },
 
@@ -380,16 +425,6 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
-    getCurrentToolInstance: {
-        value: function() {
-            if(this.toolsData.selectedTool.container) {
-                return this.toolsList[this.toolsData.selectedSubTool.action];
-            } else {
-                return this.toolsList[this.toolsData.selectedTool.action];
-            }
-        }
-    },
-
     setupGlobalHelpers: {
         value: function() {