9 files changed, 40 insertions, 1161 deletions

diff --git a/js/components/layout/document-entry.reel/document-entry.css b/js/components/layout/document-entry.reel/document-entry.css
index 6a2900be..87880b8d 100755
--- a/js/components/layout/document-entry.reel/document-entry.css
+++ b/js/components/layout/document-entry.reel/document-entry.css
@@ -42,7 +42,7 @@
     background-color:#7F7F7F;
 }
 
-.documentEntry img:hover {
+.documentEntry button:hover {
     opacity: 1.0; /* 100% */
 }
 
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index 638aea41..c46c065e 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -64,18 +64,9 @@ exports.ToolsList = Montage.create(Component, {
         }
     },
 
-    handleCloseDocument: {
-        value: function(){
-            if(!this.application.ninja.documentController.activeDocument) {
-                this.disabled = true;
-            }
-        }
-    },
-
     prepareForDraw: {
         enumerable: false,
         value: function() {
-            this.eventManager.addEventListener( "closeDocument", this, false);
             this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties;
 
             this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties;
diff --git a/js/components/layout/tools-properties.reel/tools-properties.js b/js/components/layout/tools-properties.reel/tools-properties.js
index c25559ae..6ea4ad85 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.js
+++ b/js/components/layout/tools-properties.reel/tools-properties.js
@@ -46,28 +46,6 @@ exports.ToolsProperties = Montage.create(Component, {
         }
     },
 
-    handleCloseDocument: {
-        value: function(){
-            if(!this.application.ninja.documentController.activeDocument) {
-                this.disabled = true;
-            }
-        }
-    },
-
-    prepareForDraw: {
-        enumerable: false,
-        value: function() {
-            this.eventManager.addEventListener( "closeDocument", this, false);
-        }
-    },
-
-    draw: {
-        enumerable: false,
-        value: function() {
-            //this.selectionProperties.needsDraw = true;
-        }
-    },
-
     _currentSelectedTool : {
       value: null
     },
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 948e4550..eba950b9 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -22,6 +22,30 @@ exports.DocumentController = Montage.create(Component, {
         value: []
     },
 
+    _currentDocument: {
+            value : null
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument || value.getProperty("currentView") !== "design") {
+                return;
+            }
+
+            if(this._currentDocument) {
+                this._currentDocument.model.currentView.hide();
+            }
+
+            this._currentDocument = value;
+
+            this._currentDocument.model.currentView.show();
+
+        }
+    },
+
     deserializedFromTemplate: {
         value: function() { //TODO: Add event naming consistency (save, fileOpen and newFile should be consistent, all file events should be executeFile[operation name])
             this.eventManager.addEventListener("appLoaded", this, false);
@@ -280,11 +304,11 @@ exports.DocumentController = Montage.create(Component, {
 
                                         //Open in designer view
                     this.redirectRequests = false;
-                    Montage.create(HTMLDocument).init(file, this, this._onOpenDocument, 'design', template);
+                    Montage.create(HTMLDocument).init(file, this.application.ninja, this.application.ninja.openDocument, 'design', template);
                                         break;
                                 default:
                     //Open in code view
-                    Montage.create(TextDocument).init(file, this, this._onOpenTextDocument, 'code');
+                    Montage.create(TextDocument).init(file, this.application.ninja, this.application.ninja.openDocument, 'code');
                     break;
                         }
         }
@@ -365,42 +389,10 @@ exports.DocumentController = Montage.create(Component, {
         }
     },
 
-    // Open document callback
-    _onOpenDocument: {
-        value: function(doc){
-
-
-            // Bypass all and call main.
-            // TODO: Call ninja directly once this is all cleaned up.
-
-            this.application.ninja.handleOnOpenDocument(doc);
-
-
-//            var currentDocument;
-//            if(this.activeDocument) {
-                // There is a document currently opened
-//                currentDocument = this.activeDocument;
-//            } else {
-                // There is no document opened
-
-//            }
-
-            // Set the active document
-//            this.activeDocument = doc;
-
-
-//            this.switchDocuments(currentDocument, doc, true);
-
-
-        }
-    },
-
 
     _onOpenTextDocument: {
         value: function(doc) {
 
-            this.application.ninja.handleOnOpenDocument(doc);
-
             // Main DIFFERENCE --
             // TODO: Implement Code View here
             //document.getElementById("iframeContainer").style.display = "none";
diff --git a/js/document/_toDelete/html-document.js b/js/document/_toDelete/html-document.js
deleted file mode 100755
index 447d90e3..00000000
--- a/js/document/_toDelete/html-document.js
+++ /dev/null
@@ -1,874 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-////////////////////////////////////////////////////////////////////////
-//
-var Montage =           require("montage/core/core").Montage,
-    TextDocument =      require("js/document/text-document").TextDocument,
-    NJUtils =           require("js/lib/NJUtils").NJUtils,
-        GLWorld =                       require("js/lib/drawing/world").World,
-    MaterialsModel = require("js/models/materials-model").MaterialsModel;
-////////////////////////////////////////////////////////////////////////
-//
-exports.HTMLDocument = Montage.create(TextDocument, {
-    
-    _selectionExclude: { value: null, enumerable: false },
-    _htmlTemplateUrl: { value: "js/document/templates/montage-html/index.html", enumerable: false},
-    _iframe: { value: null, enumerable: false },
-    _server: { value: null, enumerable: false },
-    _templateDocument: { value: null, enumerable: false },
-    _selectionModel: { value: [], enumerable: false },
-    _undoModel: { value: { "queue" : [], "position" : 0 }, enumerable: false},
-
-    _document: { value: null, enumerable: false },
-    _documentRoot: { value: null, enumerable: false },
-    _liveNodeList: { value: null, enumarable: false },
-    _stageBG: { value: null, enumerable: false },
-    _window: { value: null, enumerable: false },
-    _styles: { value: null, enumerable: false },
-    _stylesheets: { value: null, enumerable: false },
-    _stageStyleSheetId : { value: 'nj-stage-stylesheet', enumerable: false },
-    _userDocument: { value: null, enumerable: false },
-    _htmlSource: {value: "<html></html>", enumerable: false},
-    _glData: {value: null, enumerable: false },
-    _userComponents: { value: {}, enumarable: false},
-
-    _elementCounter: { value: 1, enumerable: false },