4 files changed, 52 insertions, 19 deletions

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index 6b0d92f7..411386f9 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -203,6 +203,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                 this.pickerModel.storeHistory(this.pickerModel.currentRoot);//populate history
 
                 this.updateMetadata(this.currentURI);
+
+                //for directory selection, selected url is the folder entered
+                if(!this.pickerModel.inFileMode ){
+                    this.okButton.removeAttribute("disabled");
+                    //put into selectedItems..currently single selection is supported
+                    this.selectedItems = [this.pickerModel.currentRoot];
+                }
             }
 
             this.element.addEventListener("openFolder", function(evt){that.handlePickerNavOpenFolder(evt);}, false);//add icon double click event listener to reload iconList with new set of data
@@ -211,6 +218,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             this.element.addEventListener("updateMetadata", function(evt){that.handlePickerNavUpdateMetadata(evt);}, false);//show metadata on click of icon
             //this.addressGo.addEventListener("click", this, false);
             this.addressBarUri.addEventListener("keydown", this, false);
+            this.addressBarUri.addEventListener("keyup", this, false);
             this.refreshButton.addEventListener("click", this, false);//refresh - gets from file system directly
             this.backArrow.addEventListener("click", this, false);
             this.forwardArrow.addEventListener("click", this, false);
@@ -608,6 +616,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                         this.backArrow.classList.remove("disable");
                     }
 
+                    //for directory selection, selected url is the folder entered
+                    if(!this.pickerModel.inFileMode ){
+                        this.okButton.removeAttribute("disabled");
+                        //put into selectedItems..currently single selection is supported
+                        this.selectedItems = [evt.folderUri];
+                    }
+
                 }
     },
 
@@ -720,6 +735,21 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
               }
     },
 
+    handleAddressBarUriKeyup:{
+        value: function(evt){
+            //disable ok if user enters an invalid uri
+            if(!this.application.ninja.coreIoApi.isValidUri(this.addressBarUri.value)){
+                //disable OK
+                if(!this.okButton.hasAttribute("disabled")){
+                    this.okButton.setAttribute("disabled", "true");
+                }
+            }else{
+                this.okButton.removeAttribute("disabled");
+                this.selectedItems = [this.addressBarUri.value];
+            }
+        }
+    },
+
     handleRefreshButtonClick:{
         value:function(evt){
                 var uri = this.addressBarUri.value;
@@ -794,7 +824,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
 
     handleOkButtonAction : {
         value: function(evt){
-                    console.log("$$$ File Picker : selected "+ this.selectedItems.toString());
+                    //console.log("$$$ File Picker : selected "+ this.selectedItems.toString());
                     var success = true;
                     if(!!this.pickerModel.callback && (this.selectedItems.length > 0)){//call the callback if it is available
                         try{
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index f397ace7..b1a22c1b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -34,17 +34,17 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
             return this._activeDocument;
         },
         set: function(doc) {
-            if(this._activeDocument)  this._activeDocument.isActive = false;
-                
-            if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
+            if(!!this._activeDocument) this._activeDocument.isActive = false;
 
             this._activeDocument = doc;
-            this._activeDocument.isActive = true;
+            if(!!this._activeDocument){
 
-            if(!!this._activeDocument.editor){
-                this._activeDocument.editor.focus();
+                if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
+                this._activeDocument.isActive = true;
+                if(!!this._activeDocument.editor){
+                    this._activeDocument.editor.focus();
+                }
             }
-
         }
     },
 
@@ -184,7 +184,7 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
                         switch (doc.extension) {
                                 case 'html': case 'html':
                                         //Open in designer view
-                                        Montage.create(HTMLDocument).initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument);
+                                        Montage.create(HTMLDocument).initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument.bind(this));
                                         break;
                                 default:
                                         //Open in code view
@@ -250,7 +250,6 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
         }
 
             var doc = this._findDocumentByUUID(id);
-            this._removeDocumentView(doc.container);
 
             var closeDocumentIndex = this._findIndexByUUID(id);
             this._documents.splice(this._findIndexByUUID(id), 1);
@@ -263,8 +262,11 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
                     nextDocumentIndex = closeDocumentIndex - 1;
                 }
                 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
+                this._removeDocumentView(doc.container);
             }else if(this._documents.length === 0){
-                //if there are no documents to switch to then just show the iframeContainer
+                this.activeDocument = null;
+                this._removeDocumentView(doc.container);
+                this.application.ninja.stage.stageView.hideRulers();
                 document.getElementById("iframeContainer").style.display="block";
             }
         }
@@ -275,11 +277,15 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     _onOpenDocument: {
         value: function(doc){
             //var data = DocumentManager.activeDocument;
-            //DocumentManager._hideCurrentDocument();
 
-            //stageManagerModule.stageManager.toggleCanvas();
+            this._hideCurrentDocument();
+            this.application.ninja.stage.stageView.hideOtherDocuments(doc.uuid);
+
+            this.application.ninja.stage.hideCanvas(false);
+
+            this.activeDocument = doc;
 
-            DocumentController.activeDocument = doc;
+            this._showCurrentDocument();
 
             NJevent("onOpenDocument", doc);
 //            appDelegateModule.MyAppDelegate.onSetActiveDocument();
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css
index 99fa9a4f..83c0e569 100755
--- a/js/ninja.reel/ninja.css
+++ b/js/ninja.reel/ninja.css
@@ -7,5 +7,3 @@
 .main {
     padding: 100px;
 }
-
-
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index 31ace49c..cd19f361 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -123,7 +123,7 @@ exports.StageView = Montage.create(Component, {
     switchDocument:{
         value: function(doc){
             //save editor cursor position
-            if(!!this.application.ninja.documentController.activeDocument.editor){
+            if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
                 this.application.ninja.documentController.activeDocument.hline = this.application.ninja.documentController.activeDocument.editor.getCursor(true);
             }
             this.application.ninja.documentController._hideCurrentDocument();
@@ -136,7 +136,7 @@ exports.StageView = Montage.create(Component, {
             var documentController = this.application.ninja.documentController;
 
             //restore editor cursor position
-            if(!!this.application.ninja.documentController.activeDocument.editor){
+            if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
                 this.application.ninja.documentController.activeDocument.editor.setCursor(this.application.ninja.documentController.activeDocument.hline);