13 files changed, 305 insertions, 155 deletions

diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 6f265c91..1431e76f 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -81,7 +81,7 @@ exports.DocumentEntry = Montage.create(Component, {
     prepareForDraw: {
         enumerable: false,
         value: function() {
-           //this.element.addEventListener("click", this, false);
+           this.element.addEventListener("click", this, false);
         }
     },
 
@@ -98,10 +98,10 @@ exports.DocumentEntry = Montage.create(Component, {
     handleClick: {
         value: function(event) {
             if(event._event.target.nodeName === "IMG") {
-                documentManagerModule.DocumentManager.closeDocument(this._uuid);
+                this.application.ninja.documentController.closeDocument(this._uuid);
             } else {
                 if(!this._document.isActive) {
-                    documentManagerModule.DocumentManager.switchDocument(this._uuid);
+                    this.application.ninja.stage.stageView.switchCodeView(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
                 }
             }
         }
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
index 61328ce0..93578ec1 100755..100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -63,6 +63,7 @@
 
 .picker .driversList:hover{
     cursor:pointer;
+    background-color: #444444;
 }
 
 .picker .highlighted{
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index eec7c8e8..268ec41a 100755..100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -621,6 +621,16 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                         this.currentSelectedNode = evt.target;
 
                     }else{
+
+
+                        //test: highlight non-selectable icons too
+                        if(!evt.target.classList.contains("selected")){
+                            evt.target.classList.add("selected");
+                        }
+                        this.currentSelectedNode = evt.target;
+                        //end- test
+
+
                         //disable OK
                         if(!this.okButton.hasAttribute("disabled")){
                             this.okButton.setAttribute("disabled", "true");
@@ -776,6 +786,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                             this.pickerModel.callback.call(this.pickerModel.callbackScope, {"uri":this.selectedItems});
                         }catch(e){
                             success = false;
+                            console.log("[Error] Failed to open "+ this.selectedItems.toString());
                             console.log(e.stack);
                         }
                     }else{//else send an event with the selected files
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css
index ca591aff..4d71f6b8 100755..100644
--- a/js/components/ui/icon-list-basic/icon.reel/icon.css
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.css
@@ -17,15 +17,18 @@
 }
 
 .icon .selected{
-    /*background-color: #d1d1d1;*/
     background-color: #919191;
 }
 
+/*highlight on hover*/
+.icon:hover{
+    background-color: #919191;
+}
+/*end- test*/
+
 .icon .iconImg{
     width:35px;
     height:35px;
-    /*border: 1px solid #000000;
-    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8);*/
     margin-left: 20px;
     margin-top: 10px;
 }
diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
index 6f363bc7..bba7e0e7 100755
--- a/js/io/document/document-controller.js
+++ b/js/io/document/document-controller.js
@@ -15,10 +15,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component,
     Uuid = require("montage/core/uuid").Uuid,
-    fileSystem = require("js/io/system/filesystem").FileSystem;
-
-var HTMLDocument = require("js/io/document/html-document").HTMLDocument;
-var TextDocument = require("js/io/document/text-document").TextDocument;
+    nj= require("js/lib/NJUtils.js").NJUtils,
+    HTMLDocument = require("js/io/document/html-document").HTMLDocument,
+    TextDocument = require("js/io/document/text-document").TextDocument;
 
 var DocumentController = exports.DocumentController = Montage.create(Component, {
     hasTemplate: {
@@ -96,7 +95,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     openFileWithURI: {
         value: function(uriArrayObj) {
-            var uri = "", fileContent = "", response=null;
+            var uri = "", fileContent = "", response=null, filename="", fileType="js";
             if(!!uriArrayObj && !!uriArrayObj.uri && (uriArrayObj.uri.length > 0)){
                 uri = uriArrayObj.uri[0];
             }
@@ -104,18 +103,23 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
             // Get file from Jose Code with a callback to here
             if(!!uri){
-                response = fileSystem.shellApiHandler.openFile({"uri":uri});
+                response = this.application.ninja.coreIoApi.openFile({"uri":uri});
                 if((response.success === true) && ((response.status === 200) || (response.status === 304))){
                     fileContent = response.content;
                 }
 
-                console.log("$$$ "+uri+"\n content = \n\n\n"+ fileContent+"\n\n\n");
-                this.openDocument({"type": "js", "name": "tmp.js", "source": fileContent});
+                //console.log("$$$ "+uri+"\n content = \n\n\n"+ fileContent+"\n\n\n");
+                filename = nj.getFileNameFromPath(uri);
+                if(uri.indexOf('.') != -1){
+                    fileType = uri.substr(uri.lastIndexOf('.') + 1);
+                }
+                this.openDocument({"type": ""+fileType, "name": ""+filename, "source": fileContent});
             }
 
         }
     },
 
+
     openProjectWithURI: {
         value: function(uri) {
             console.log("URI is: ", uri);
@@ -211,7 +215,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this._documents.splice(this._findIndexByUUID(id), 1);
 
             if(this.activeDocument.uuid === id && this._documents.length > 0) {
-                this.switchDocument(this._documents[0].uuid)
+                this.switchDocument(this._documents[0].uuid);
             }
         }
     },
@@ -254,11 +258,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                             lineNumbers: true,
                             mode: "htmlmixed",
                             onCursorActivity: function() {
-                                DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.hline, null);
-                                DocumentManager._codeEditor.hline = DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.editor.getCursor().line, "activeline");
+                                DocumentController._codeEditor.editor.setLineClass(DocumentController._codeEditor.hline, null);
+                                DocumentController._codeEditor.hline = DocumentController._codeEditor.editor.setLineClass(DocumentController._codeEditor.editor.getCursor().line, "activeline");
                             }