From ffe7ddf30aeb2b89d49a91c76406aed93f6bed7a Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 14 Feb 2012 14:03:17 -0800
Subject: use button tag for save as dialog

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/io/ui/save-as-dialog.reel/save-as-dialog.css  | 57 ++++++++++++++----------
 js/io/ui/save-as-dialog.reel/save-as-dialog.html |  4 +-
 2 files changed, 36 insertions(+), 25 deletions(-)

(limited to 'js')

diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.css b/js/io/ui/save-as-dialog.reel/save-as-dialog.css
index 40434c25..92970706 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.css
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.css
@@ -10,8 +10,12 @@
     height:150px;
     padding-left: 15px;
     padding-right: 15px;
-    background-color:#313131;
     color: #ffffff;
+    background-color:#494949;
+    font-family: 'Droid Sans', sans-serif;
+    border-radius: 8px;
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+    text-shadow: 1px 1px 1px #000;
 }
 
 .saveAsDialog .title{
@@ -24,7 +28,7 @@
 }
 
 .saveAsDialog .locationSelection{
-    border: 1px groove #000000;
+    border: 1px solid #000000;
     overflow: auto;
     height:38%;
     padding: 15px;
@@ -65,31 +69,38 @@
     margin-left:3px;
 }
 
+.saveAsDialog .buttons button {
+	float: left;
+	width: 100px;
+	margin-top: 3px;
+}
+
 .saveAsDialog .okButton{
-    margin-right:25px;
-    -webkit-box-align: center;
-    text-align: center;
-    cursor: default;
-    padding: 0px 6px 0px;
-    border:2px solid #d1d1d1;
-    background-color: #e1e1e1;
-    box-sizing: border-box;
-    border-radius:10px;
-    background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
-    cursor:pointer;
+    margin: 0px 5px 0px 5px;
+    /*margin-right:25px;*/
+    /*-webkit-box-align: center;*/
+    /*text-align: center;*/
+    /*cursor: default;*/
+    /*padding: 0px 6px 0px;*/
+    /*border:2px solid #d1d1d1;*/
+    /*background-color: #e1e1e1;*/
+    /*box-sizing: border-box;*/
+    /*border-radius:10px;*/
+    /*background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);*/
+    /*cursor:pointer;*/
 }
 
 .saveAsDialog .cancelButton{
-    -webkit-box-align: center;
-    text-align: center;
-    cursor: default;
-    padding: 0px 6px 0px;
-    border:2px solid #d1d1d1;
-    background-color: #e1e1e1;
-    box-sizing: border-box;
-    border-radius:10px;
-    background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
-    cursor:pointer;
+    /*-webkit-box-align: center;*/
+    /*text-align: center;*/
+    /*cursor: default;*/
+    /*padding: 0px 6px 0px;*/
+    /*border:2px solid #d1d1d1;*/
+    /*background-color: #e1e1e1;*/
+    /*box-sizing: border-box;*/
+    /*border-radius:10px;*/
+    /*background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);*/
+    /*cursor:pointer;*/
 }
 
 .saveAsDialog input[type="button"]:disabled{
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
index f2011a34..4f0d5779 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
@@ -48,8 +48,8 @@
     </div>
     <div class="errorMsg"><span id="error" class="error"></span></div>
     <div class="buttons">
-        <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" />
-        <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" />
+        <button id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" >CANCEL</button>
+        <button id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" >OK</button>
     </div>
 
 </div>
-- 
cgit v1.2.3


From ec14eff9831026600ba4cf71810444d54e143e04 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 14 Feb 2012 14:53:32 -0800
Subject: allow / in windows directory path

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/io/system/coreioapi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index 614b0850..ea9627cc 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -1101,7 +1101,7 @@ window.hack = function (name, type) {
                 uri = uri.replace(/^\s+|\s+$/g,"");  // strip any leading or trailing spaces
 
                 //for local machine folder uri
-                isWindowsUri = /^([a-zA-Z]:)(\\[^<>:"/\\|?*]+)*\\?$/gi.test(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;}
-- 
cgit v1.2.3