2 files changed, 24 insertions, 34 deletions

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 968512f6..f2011a34 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
@@ -10,36 +10,6 @@
     <link rel="stylesheet" type="text/css" href="save-as-dialog.css">
     <script type="text/montage-serialization">
     {
-        "okButton": {
-            "module": "montage/ui/button.reel",
-            "name": "Button",
-            "properties": {
-                "element": {"#": "okButton"},
-                "identifier": "okButton"
-            },
-            "listeners": [
-                {
-                    "type": "action",
-                    "listener": {"@": "owner"}
-                }
-            ]
-        },
-
-        "cancelButton": {
-            "module": "montage/ui/button.reel",
-            "name": "Button",
-            "properties": {
-                "element": {"#": "cancelButton"},
-                "identifier": "cancelButton"
-            },
-            "listeners": [
-                {
-                    "type": "action",
-                    "listener": {"@": "owner"}
-                }
-            ]
-        },
-
         "fileInputField":{
             "module": "js/components/ui/FilePicker/file-input-field.reel",
             "name": "FileInputField",
@@ -56,7 +26,8 @@
                 "fileInputField": {"@": "fileInputField"},
                 "newFileName": {"#": "newFileName"},
                 "error":{"#": "error"},
-                "okButton":{"#": "okButton"}
+                "okButton":{"#": "okButton"},
+                "cancelButton":{"#": "cancelButton"}
             }
         }
     }
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
index de5266a5..d1f1c26b 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
@@ -6,7 +6,6 @@ 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;
-    //nj= ("js/lib/NJUtils.js").NJUtils;
 
 var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
 
@@ -58,6 +57,9 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
             this.newFileName.addEventListener("blur", function(evt){self.handleNewFileNameOnblur(evt);}, false);
             this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false);
 
+            this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false);
+            this.cancelButton.addEventListener("click", function(evt){self.handleCancelButtonAction(evt);}, false);
+
             this.enableOk();
         }
     },
@@ -163,7 +165,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
     },
     isValidFileName:{
         value: function(fileName){
-            var status = nj.isValidFileName(fileName);
+            var status = this.isValidFileName(fileName);
             if(fileName !== ""){
                 if(!status){
                     this.showError("! Invalid file name.");
@@ -191,6 +193,23 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
                 this.okButton.setAttribute("disabled", "true");
             }
         }
-    }
+    },
+
+       /***
+         * 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;
+            }
+        }
 
 });
\ No newline at end of file