8 files changed, 211 insertions, 74 deletions

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/utils/file-utils.js b/js/io/utils/file-utils.js
new file mode 100644
index 00000000..c43fb41c
--- /dev/null
+++ b/js/io/utils/file-utils.js
@@ -0,0 +1,75 @@
+/* <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 fileSystem = require("js/io/system/filesystem").FileSystem;
+
+var FileUtils = exports.FileUtils = Object.create(Object.prototype, {
+
+    /***
+     * checks for valid uri pattern
+     * also flags if Windows uri pattern and Unix uri patterns are mixed
+     */
+    isValidUri:{
+        value: function(uri){
+            var isWindowsUri=false, isUnixUri=false,status=false;
+            if(uri !== ""){
+                uri = uri.replace(/^\s+|\s+$/g,"");  // strip any leading or trailing spaces
+
+                //for local machine folder uri
+                isWindowsUri = /^([a-zA-Z]:)(\\[^<>:"/\\|?*]+)*\\?$/gi.test(uri);
+                isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix
+                status = isWindowsUri || isUnixUri;
+                if(isWindowsUri && isUnixUri){status = false;}
+            }
+            return status;
+        }
+    },
+
+    /***
+     * file name validation
+     */
+    isValidFileName:{
+        value: function(fileName){
+            var status = false;
+            if(fileName !== ""){
+                fileName = fileName.replace(/^\s+|\s+$/g,"");
+                status = !(/[/\\]/g.test(fileName));
+                if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden
+                    status = !(/^\./g.test(fileName));
+                }
+            }
+            return status;
+        }
+    },
+
+    /***
+     * check if the file exists
+     */
+    checkFileExists:{
+        value: function(fileUri, folderUri, fileType){
+            var uri = "", response=null, status=true;
+
+            //prepare absolute uri
+            if(/[^/\\]$/g.test(folderUri)){
+                folderUri = folderUri + "/";
+            }
+
+            //todo:add file extension check if fileType present
+
+            uri = ""+folderUri+fileUri;
+
+            response = fileSystem.shellApiHandler.fileExists({"uri":uri});
+            if(!!response && response.success && (response.status === 204)){
+                status = true;
+            }else if(!!response && response.success && (response.status === 404)){
+                status = false;
+            }else{
+                status = false;
+            }
+            return status;
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 61b963b3..7702b1a2 100755..100644
--- a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -9,7 +9,7 @@ var Montage = require("montage/core/core").Montage,
      iconsListModule = require("js/components/ui/icon-list-basic/iconsList.reel"),
     treeModule = require("js/components/ui/tree-basic/tree.reel"),
     newFileLocationSelectionModule = require("js/io/workflow/newFileDialog/new-file-workflow-controller"),
-    fileSystem = require("js/io/system/filesystem").FileSystem;
+    fileUtils = require("js/io/utils/file-utils").FileUtils;
 
 var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, {
 
@@ -244,7 +244,6 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                     this.okButton.setAttribute("disabled", "true");
                 }
             }
-
         }
     },
 
@@ -336,16 +335,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
     isValidUri:{
         value: function(uri){
-            var isWindowsUri=false, isUnixUri=false,status=false;
+            var status= fileUtils.isValidUri(uri);
             if(uri !== ""){
-                uri = uri.replace(/^\s+|\s+$/g,"");  // strip any leading or trailing spaces
-
-                //for local machine folder uri
-                isWindowsUri = /^([a-zA-Z]:)(\\[^<>:"/\\|?*]+)*\\?$/gi.test(uri);
-                isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix
-                status = isWindowsUri || isUnixUri;
-                if(isWindowsUri && isUnixUri){status = false;}
-
                 if(!status){
                     this.showError("! Invalid directory.");
                 }
@@ -355,14 +346,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     },