18 files changed, 150 insertions, 109 deletions

diff --git a/js/components/layout/documents-tab.reel/documents-tab.js b/js/components/layout/documents-tab.reel/documents-tab.js
index 0be639db..41c98b30 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.js
+++ b/js/components/layout/documents-tab.reel/documents-tab.js
@@ -8,40 +8,6 @@ var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
 exports.DocumentsTab = Montage.create(Component, {
-
-    /*
-    openDocuments: {
-        value: []
-    },
-
-    prepareForDraw: {
-        enumerable: false,
-        value: function() {
-//            console.log("Change this to be inside the Ninja Reel");
-            this.openDocuments = this.application.ninja.documentController._documents;
-//            this.eventManager.addEventListener( "appLoaded", this, false);
-        }
-    },
-
-    handleAppLoaded: {
-        value: function() {
-//            this.openDocuments = this.application.ninja.currentDocument;
-        }
-    },
-
-    draw: {
-        enumerable: false,
-        value: function() {
-
-        }
-    },
-
-    handleClick: {
-        value: function(event) {
-            
-        }
-    }
-    */
     contentController: {
         value: null
     }
diff --git a/js/components/toolbar.reel/toolbar-button.js b/js/components/toolbar.reel/toolbar-button.js
new file mode 100644
index 00000000..9ada9b29
--- /dev/null
+++ b/js/components/toolbar.reel/toolbar-button.js
@@ -0,0 +1,28 @@
+/* <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").Montage,
+    Component = require("montage/ui/component").Component,
+    Button = require("montage/ui/button.reel/button").Button;
+
+var ToolbarButton = exports.ToolbarButton = Montage.create(Button, {
+    hasTemplate : {
+        value: false
+    },
+    _sourceObject : {
+        value: null
+    },
+    sourceObject : {
+        get: function() {
+            return this._sourceObject;
+        },
+        set: function(value) {
+            if(value === this._sourceObject) { return; }
+
+            this._sourceObject = value;
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index d2c5972a..51e7ebec 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -30,7 +30,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             },
             
             "button": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "js/components/toolbar.reel/toolbar-button",
                 "properties": {
                     "element": {"#": "button" },
                     "label": " "
diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index d0b1f179..d292f838 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -32,6 +32,7 @@ exports.CodeEditorController = Montage.create(Component, {
             if(!value) {
 
             } else if(this._currentDocument.currentView === "code") {
+                this._currentDocument.model.views.code.editor.focus();
                 this.applySettings();
             }
         }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index e059e7e1..f85e2f97 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -54,6 +54,7 @@ exports.DocumentController = Montage.create(Component, {
                 document.getElementById("codeViewContainer").style.display = "block";
             } else if(this._currentDocument.currentView === "design") {
                 this._currentDocument.model.currentView.show();
+                this._currentDocument.model.views.design._liveNodeList = this._currentDocument.model.documentRoot.getElementsByTagName('*');
             } else {
                 document.getElementById("iframeContainer").style.display = "none";
                 this._currentDocument.model.currentView.show();
@@ -149,10 +150,10 @@ exports.DocumentController = Montage.create(Component, {
     handleExecuteSave: {
         value: function(event) {
                 //
-                if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                if((typeof this.currentDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
                         //Currently we don't need a callback handler
                         //this.activeDocument.model.save(this.saveExecuted.bind(this));
-                        this.activeDocument.model.save();
+                        this.currentDocument.model.save();
                 } else {
                         //Error: cloud not available and/or no active document
                 }
@@ -193,16 +194,13 @@ exports.DocumentController = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     handleExecuteFileClose:{
         value: function(event) {
-                if (this.activeDocument) {
-                this.closeFile(this.activeDocument);
-                }
+            this.closeFile(this.currentDocument);
         }
     },
     ////////////////////////////////////////////////////////////////////
     //TODO: Is this used, should be cleaned up
     handleExecuteFileCloseAll:{
                 value: function(event) {
-                        var i=0;//TODO: who is using this??
                         if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
                                 while(this._documents.length > 0){
                                         this.closeDocument(this._documents[this._documents.length -1].uuid);
@@ -355,14 +353,8 @@ exports.DocumentController = Montage.create(Component, {
             if(currentDocument) {
                 if(currentDocument.currentView === "design") {
                     currentDocument.serializeDocument();
-                    this.application.ninja._currentSelectedContainer = this.application.ninja.selectionController._selectionContainer = null;
-                    currentDocument.model.views.design.propertiesPanel.clear();
                 }
 
-                currentDocument.model.isActive = false;
-
-                currentDocument.model.currentView.hide();
-
                 if(currentDocument.model.parentContainer !== newDocument.model.parentContainer) {
                     currentDocument.model.parentContainer.style["display"] = "none";
                     newDocument.model.parentContainer.style["display"] = "block";
@@ -383,13 +375,9 @@ exports.DocumentController = Montage.create(Component, {
                 this.application.ninja.stage.hideRulers();
             }
 
-//            this.application.ninja.stage.clearAllCanvas();
-
             if(didCreate) {
-//                newDocument.model.currentView.show();
-
                 if(newDocument.currentView === "design") {
-                    NJevent("onOpenDocument", newDocument);
+