4 files changed, 22 insertions, 33 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index ca3cd585..87e93465 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -166,7 +166,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     ////////////////////////////////////////////////////////////////////
     handleExecuteFileClose:{
         value: function(event) {
-            if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+            if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
                 this.closeDocument(this.activeDocument.uuid);
             }
         }
@@ -372,11 +372,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                     nextDocumentIndex = closeDocumentIndex - 1;
                 }
                 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
-                doc.stopVideos();
+                if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();}
                 this._removeDocumentView(doc.container);
             }else if(this._documents.length === 0){
-                if(typeof this.activeDocument.pauseVideos !== "undefined"){
-                    this.activeDocument.pauseVideos(true);
+                if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){
+                    this.activeDocument.pauseAndStopVideos();
                 }
                 this.activeDocument = null;
                 this._removeDocumentView(doc.container);
@@ -385,8 +385,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
                 this.application.ninja.stage.hideCanvas(true);
             }else{//closing inactive document tab - just clear DOM
-                if(typeof doc.pauseVideos !== "undefined"){
-                    doc.pauseVideos(true);
+                if(typeof doc.pauseAndStopVideos !== "undefined"){
+                    doc.pauseAndStopVideos();
                 }
                 this._removeDocumentView(doc.container);
             }
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index eff9c91a..c713b6e5 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -100,20 +100,6 @@ exports.SelectionController = Montage.create(Component, {
                     this._isDocument = false;
                 }
                 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
-
-                this._selectionContainer = this.application.ninja.currentSelectedContainer;
-            }
-        }
-    },
-
-    handleCloseDocument:{
-        value: function() {
-            //clear selections if all documents are closed
-            if(this.application.ninja.documentController._documents.length === 0){
-                this._selectedItems.length =0;
-                this.application.ninja.selectedElements.length =0;
-                this._isDocument = true;
-                NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
             }
         }
     },
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 83f91c19..f730b853 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -872,22 +872,15 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     },
         ////////////////////////////////////////////////////////////////////
     /**
-     *pause videos on switching or closing the document, so that the browser does not keep downloading the media data
-     *removeSrc : boolean to remove the src if the video... set only in the close document flow
+     *pause videos on switching or closing the document
     */
     pauseVideos:{
-        value:function(removeSrc){
-            //console.log("$$$ pauseVideos");
+        value:function(){
             var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;
             for(i=0;i<videosArr.length;i++){
                 if(!videosArr[i].paused){
                     videosArr[i].pause();
                 }
-                //console.log("$$$ Paused ", videosArr[i]);
-                if((typeof removeSrc !== "undefined") && (removeSrc === true)){
-                    videosArr[i].src = "";
-                    //console.log("$$$ stopped ");
-                }
             }
         }
     },
@@ -897,11 +890,21 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     */
     stopVideos:{
         value:function(){
-            //console.log("$$$ stopVideos");
             var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;
             for(i=0;i<videosArr.length;i++){
                 videosArr[i].src = "";
-                //console.log("$$$ stopped ", videosArr[i]);
+            }
+        }
+    },
+
+    pauseAndStopVideos:{
+        value:function(){
+            var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;
+            for(i=0;i<videosArr.length;i++){
+                if(!videosArr[i].paused){
+                    videosArr[i].pause();
+                }
+                videosArr[i].src = "";
             }
         }
     }
diff --git a/js/stage/layout.js b/js/stage/layout.js
index ab2daf9b..8a53a08b 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -65,7 +65,7 @@ exports.Layout = Montage.create(Component, {
     handleOpenDocument: {
         value: function() {
             // Initial elements to draw is the entire node list
-            if(typeof this.application.ninja.documentController.activeDocument._liveNodeList !== "undefined"){//only for designer view
+            if(this.application.ninja.documentController.activeDocument.currentView === "design"){//only for designer view
                 this.elementsToDraw = this.application.ninja.documentController.activeDocument._liveNodeList;
             }
             // Draw the elements and the 3d info
@@ -105,7 +105,7 @@ exports.Layout = Montage.create(Component, {
             }
 
             // Make an array copy of the line node list which is not an array like object
-            if(typeof this.application.ninja.documentController.activeDocument._liveNodeList !== "undefined"){//only for designer view
+            if(this.application.ninja.documentController.activeDocument.currentView === "design"){//only for designer view
                 this.domTree = Array.prototype.slice.call(this.application.ninja.documentController.activeDocument._liveNodeList, 0);
             }
             // Clear the elements to draw