17 files changed, 126 insertions, 152 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 2db775eb..49dbe3cb 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -21,7 +21,7 @@ exports.Breadcrumb = Montage.create(Component, {
 
     handleCloseDocument: {
         value: function(){
-            if(!this.application.ninja.documentController.activeDocument) {
+            if(!this.application.ninja.documentController.activeDocument && this.application.ninja.currentDocument.currentView !== "code") {
                 this.disabled = true;
                 this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.model.documentRoot : null);
             }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index eecf9146..2c34eedf 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -377,10 +377,10 @@ exports.DocumentController = Montage.create(Component, {
 
             if(this._documents.length > 0) {
                 previousFocusedDocument = this._documents[this._documents.length - 1];
-                this._activeDocument = previousFocusedDocument;
-                this.switchDocuments(this.activeDocument, previousFocusedDocument, true);
+                this.activeDocument = previousFocusedDocument;
+                this.switchDocuments(this.activeDocument, previousFocusedDocument, false);
             } else {
-                this._activeDocument = null;
+                this.activeDocument = null;
                 this.application.ninja.stage.hideRulers();
 
                 this.application.ninja.stage.hideCanvas(true);
@@ -502,14 +502,16 @@ exports.DocumentController = Montage.create(Component, {
                     this.application.ninja.stage.restoreAllPanels();
                     this.application.ninja.stage.hideCanvas(false);
                     this.application.ninja.stage.showRulers();
-                } else if(currentDocument.currentView === "design" && newDocument.currentView === "code") {
-                    this.application.ninja.stage.showCodeViewBar(true);
-                    this.application.ninja.stage.collapseAllPanels();
-                    this.application.ninja.stage.hideCanvas(true);
-                    this.application.ninja.stage.hideRulers();
                 }
             }
 
+            if(newDocument.currentView === "code") {
+                this.application.ninja.stage.showCodeViewBar(true);
+                this.application.ninja.stage.collapseAllPanels();
+                this.application.ninja.stage.hideCanvas(true);
+                this.application.ninja.stage.hideRulers();
+            }
+
             this.application.ninja.stage.clearAllCanvas();
 
             if(didCreate) {
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 7bef0db8..75bffc5c 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -67,10 +67,9 @@ exports.SelectionController = Montage.create(Component, {
             this._isDocument = true;
 
             if(currentSelectionArray) {
-                if(currentSelectionArray.length >= 1) {
+                this.application.ninja.selectedElements = currentSelectionArray;
+                if(currentSelectionArray.length) {
                     this._isDocument = false;
-
-                    this.application.ninja.selectedElements = currentSelectionArray;
                     NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
                 }
             }
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 04e87ba7..534f77c7 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -81,7 +81,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         set : function(document) {
             ///// If the document is null set default stylesheets to null
 
-            if(!document) {
+            if(!document || document.currentView === "code") {
                 this._activeDocument   = null;
                 this._stageStylesheet  = null;
                 this.defaultStylesheet = null;
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 2375632c..157d7a0e 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -84,7 +84,7 @@ exports.HtmlDocument = Montage.create(Component, {
                 //Rendering design view, using observers to know when template is ready
                 this.model.views.design.render(function () {
                         //TODO: Why is this needed?
-                        this._liveNodeList = this.model.documentRoot.getElementsByTagName('*');
+                    this.model.views.design._liveNodeList = this.documentRoot.getElementsByTagName('*');
                         //Adding observer to know when template is ready
                         this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this));
                                 this._observer.observe(this.model.views.design.document.head, {childList: true});
diff --git a/js/document/views/design.js b/js/document/views/design.js
index d1c75c01..06708957 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -67,8 +67,34 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     propertiesPanel: {
         value: null
     },
+
     ////////////////////////////////////////////////////////////////////
     //
+    _liveNodeList: {
+        value: null
+    },
+
+    getLiveNodeList: {
+        value: function(useFilter) {
+            if(useFilter) {
+                var filteredNodes = [],
+                    childNodes = Array.prototype.slice.call(this._liveNodeList, 0);
+
+                childNodes.forEach(function(item) {
+                    if( (item.nodeType === 1) && (item.nodeName !== "STYLE") && (item.nodeName !== "SCRIPT")) {
+                        filteredNodes.push(item);
+                    }
+                });
+                return filteredNodes;
+            } else {
+                return Array.prototype.slice.call(this._liveNodeList, 0);
+            }
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+
+    //
         initialize: {
         value: function (parent) {
                 //Creating iFrame for view
@@ -190,9 +216,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 this._bodyFragment = null;
                 //Calling standard method to finish opening document
                 this.bodyContentLoaded(null);
-            //TODO: Move this to be set via the controller
-            this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
-            this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 9de85216..871b832d 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -119,7 +119,10 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
     initializeFromDocument:{
         value:function(){
-            var documentRootChildren = null, i, stage = this.application.ninja.stage;
+            var i,
+                documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true),
+                stage = this.application.ninja.stage,
+                len = documentRootChildren.length;
             //initialize with current document
             this._eltArray = [];
             this._planesArray = [];
@@ -128,11 +131,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this.setWorkingPlane( [0,0,1,0] );
 
             //Loop through all the top-level children of the current document and call drawUtils.addElement on them
-            if(this.application.ninja.currentDocument._liveNodeList.length > 0){
-                documentRootChildren = this.application.ninja.currentDocument._liveNodeList;
-                var len = documentRootChildren.length,
-                    minLeft = stage.userPaddingLeft,
-                    minTop = stage.userPaddingTop,
+            if(len > 0) {
+                var initL = 0,
+                    initT = 0,
+                    minLeft = 0,
+                    minTop = 0,
                     docLeft = stage.documentOffsetLeft,
                     docTop = stage.documentOffsetTop,
                     l,
@@ -151,10 +154,10 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {