From 8acdde3e87f8cabd179a068c54fe5b78fa38e40d Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 5 Apr 2012 22:54:53 -0700
Subject: - using Montage TextField component to handle any edits like keyup,
 paste, cut. - optimized Enter and Esc key handling

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../file-input-field.reel/file-input-field.html    | 10 ++-
 .../file-input-field.reel/file-input-field.js      | 37 +++++-----
 .../new-file-location.reel/new-file-location.html  |  9 ++-
 .../new-file-location.reel/new-file-location.js    | 32 ++++-----
 .../new-file-options-navigator.js                  | 45 ++++++------
 js/io/ui/save-as-dialog.reel/save-as-dialog.html   |  9 ++-
 js/io/ui/save-as-dialog.reel/save-as-dialog.js     | 79 ++++++++++++----------
 7 files changed, 127 insertions(+), 94 deletions(-)

(limited to 'js/io')

diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
index 2fcaa075..00df1c11 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
@@ -10,13 +10,21 @@
     <link rel="stylesheet" type="text/css" href="file-input-field.css">
     <script type="text/montage-serialization">
     {
+
+        "newFileDirectory": {
+            "prototype": "montage/ui/textfield.reel",
+            "properties": {
+                "element": {"#": "newFileDirectory"}
+            }
+        },
+
         "owner":{
             "module": "js/io/ui/file-picker/file-input-field.reel",
             "name": "FileInputField",
             "properties": {
                 "element": {"#": "fileInputField"},
                 "findDirectory": {"#": "findDirectory"},
-                "newFileDirectory": {"#": "newFileDirectory"}
+                "newFileDirectory": {"@": "newFileDirectory"}
             }
         }
     }
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
index 0f66468a..9e77759f 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
@@ -14,14 +14,10 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
         value: function() {
             var that = this;
             this.findDirectory.identifier = "findDirectory";
-
             this.findDirectory.addEventListener("click", this, false);
-
-            this.eventManager.addEventListener("pickerSelectionsDone", function(evt){that.handleFileInputPickerSelectionsDone(evt);}, false);
-
-            this.newFileDirectory.addEventListener("keyup", function(evt){that.handleNewFileDirectoryOnkeyup(evt);}, false);
-            this.newFileDirectory.addEventListener("paste", this, false);
-            this.newFileDirectory.addEventListener("search", this, false);
+            this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false);
+            this.addEventListener("change@newFileDirectory.value", this.handleNewFileDirectoryChange, false);
+            this.newFileDirectory.element.addEventListener("keyup", this, false);
         }
     },
 
@@ -65,15 +61,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
         }
     },
 
-    handlePaste:{
-        value:function(evt){
-            evt.preventDefault();
-            evt.target.value = evt.clipboardData.getData("Text");
-            this.handleNewFileDirectoryOnkeyup(evt);
-        }
-    },
-
-    handleNewFileDirectoryOnkeyup:{
+    handleNewFileDirectoryChange:{
           value:function(evt){
               var newFileDirectorySetEvent = document.createEvent("Events");
               newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false);
@@ -83,9 +71,18 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
           }
     },
 
-    handleSearch:{
-        value:function(evt){
-            this.handleNewFileDirectoryOnkeyup(evt);
+
+    handleKeyup:{
+        value: function(evt){
+            if(evt.keyCode === 13){
+                var enterKeyupEvent = document.createEvent("Events");
+                enterKeyupEvent.initEvent("enterKey", false, false);
+                this.eventManager.dispatchEvent(enterKeyupEvent);
+            }else if(evt.keyCode === 27){
+                var escKeyupEvent = document.createEvent("Events");
+                escKeyupEvent.initEvent("escKey", false, false);
+                this.eventManager.dispatchEvent(escKeyupEvent);
+            }
         }
     },
 
@@ -110,7 +107,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
             if(!!obj && obj.uri && obj.uri.length > 0){
                 selectedUri = obj.uri[0];
                 this.newFileDirectory.value = selectedUri;
-                this.newFileDirectory.focus();
+                this.newFileDirectory.element.focus();
                 var newFileDirectorySetEvent = document.createEvent("Events");
                   newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false);
                   newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value;
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index 7340251c..1f9d9b9f 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
@@ -58,13 +58,20 @@
             }
         },
 
+        "newFileName": {
+            "prototype": "montage/ui/textfield.reel",
+            "properties": {
+                "element": {"#": "newFileName"}
+            }
+        },
+
         "owner":{
             "module": "js/io/ui/new-file-dialog/new-file-location.reel",
             "name": "NewFileLocation",
             "properties": {
                 "element": {"#": "newfileLocation"},
                 "fileInputField": {"@": "fileInputField"},
-                "newFileName": {"#": "newFileName"}
+                "newFileName": {"@": "newFileName"}
             }
         }
     }
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
index 3582f1a5..3ac38d02 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
@@ -22,23 +22,28 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
         value: function() {
             this.fileInputField.selectDirectory = true;
 
-            this.newFileName.addEventListener("keyup", this, false);
-            this.newFileName.addEventListener("paste", this, false);
-            this.newFileName.addEventListener("search", this, false);
-			this.newFileName.focus();
-            this.newFileName.select();
+            this.addEventListener("change@newFileName.value", this.newFileNameChange, false);
+            this.newFileName.element.addEventListener("keyup", this, false);
+			this.newFileName.element.focus();
+            this.newFileName.element.select();
         }
     },
 
-    handlePaste:{
-        value:function(evt){
-            evt.preventDefault();
-            evt.target.value = evt.clipboardData.getData("Text");
-            this.handleKeyup(evt);
+    handleKeyup:{
+        value: function(evt){
+            if(evt.keyCode === 13){
+                var enterKeyupEvent = document.createEvent("Events");
+                enterKeyupEvent.initEvent("enterKey", false, false);
+                this.eventManager.dispatchEvent(enterKeyupEvent);
+            }else if(evt.keyCode === 27){
+                var escKeyupEvent = document.createEvent("Events");
+                escKeyupEvent.initEvent("escKey", false, false);
+                this.eventManager.dispatchEvent(escKeyupEvent);
+            }
         }
     },
 
-    handleKeyup:{
+    newFileNameChange:{
         value:function(evt){
             var newFileNameSetEvent = document.createEvent("Events");
             newFileNameSetEvent.initEvent("newFileNameSet", false, false);
@@ -46,10 +51,5 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
             newFileNameSetEvent.keyCode = evt.keyCode;
             this.eventManager.dispatchEvent(newFileNameSetEvent);
         }
-    },
-    handleSearch:{
-       value:function(evt){
-            this.handleKeyup(evt);
-        }
     }
 });
\ No newline at end of file
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 35c3b28e..552e8f6f 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -145,6 +145,9 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 }
             }, true);
 
+            this.eventManager.addEventListener("enterKey", this, false);
+            this.eventManager.addEventListener("escKey", this, false);
+
         }
 
     },
@@ -326,32 +329,36 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
     handleNewFileDirectorySet:{
         value:function(evt){
-            if(evt.keyCode === 13){
-                if(!this.okButton.hasAttribute("disabled")) this.handleOkButtonAction(evt);
-            }else if(evt.keyCode === 27){
-                this.handleCancelButtonAction(evt);
-            }
-            else{
-                this.newFileDirectory = evt._event.newFileDirectory;
-                if(this.isValidUri(this.newFileDirectory)){
-                    this.enableOk();
-                }
+            this.newFileDirectory = evt._event.newFileDirectory;
+            if(this.isValidUri(this.newFileDirectory)){
+                this.enableOk();
             }
         }
     },
 
     handleNewFileNameSet:{
         value:function(evt){
-            if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){
-                this.handleOkButtonAction(evt);
-            }else if(evt.keyCode === 27){
-                this.handleCancelButtonAction(evt);
+            this.newFileName = evt._event.newFileName;
+            if(this.isValidFileName(this.newFileName)){
+                this.enableOk();
             }
-            else{
-                this.newFileName = evt._event.newFileName;
-                if(this.isValidFileName(this.newFileName)){
-                    this.enableOk();
-                }
+        }
+    },
+
+    handleEnterKey:{
+        value: function(evt){
+            if((this.application.ninja.newFileController.newFileOptionsNav !== null)
+                  && !this.okButton.hasAttribute("disabled")){
+
+                    this.handleOkButtonAction(evt);
+              }
+        }
+    },
+
+    handleEscKey:{
+        value: function(evt){
+            if(this.application.ninja.newFileController.newFileOptionsNav !== null){
+                this.handleCancelButtonAction(evt);
             }
         }
     },
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 374e3d48..453d7a96 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
@@ -18,13 +18,20 @@
             }
         },
 
+        "newFileName": {
+            "prototype": "montage/ui/textfield.reel",
+            "properties": {
+                "element": {"#": "newFileName"}
+            }
+        },
+
         "owner":{
             "module": "js/io/ui/new-file-dialog/new-file-location.reel",
             "name": "SaveAsDialog",
             "properties": {
                 "element": {"#": "saveAsDialog"},
                 "fileInputField": {"@": "fileInputField"},
-                "newFileName": {"#": "newFileName"},
+                "newFileName": {"@": "newFileName"},
                 "error":{"#": "error"},
                 "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 81d1afee..5df91ab9 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
@@ -36,7 +36,12 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
         writable: true,
         value: null
     },
-
+    prepareForDraw: {
+            value: function() {
+                this.newFileName.value = this.fileName;
+                this.fileInputField.newFileDirectory.value = this.folderUri;
+            }
+    },
     willDraw: {
         enumerable: false,
         value: function() {}
@@ -51,19 +56,16 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
             var self = this;
             this.fileInputField.selectDirectory = true;
             this.fileInputField.pickerName = "saveAsDirectoryPicker";
-            this.newFileName.value = this.fileName;
-            this.fileInputField.newFileDirectory.value = this.folderUri;
 
-            this.newFileName.addEventListener("keyup", function(evt){self.handleNewFileNameOnkeyup(evt);}, false);
-            this.newFileName.addEventListener("paste", this, false);
-            this.newFileName.addEventListener("search", this, false);
+            this.addEventListener("change@newFileName.value", this.handleNewFileNameChange, false);
+            this.newFileName.element.addEventListener("keyup", this, 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.newFileName.focus();
-            this.newFileName.select();
+            this.eventManager.addEventListener("enterKey", this, false);
+            this.eventManager.addEventListener("escKey", this, false);
+
 
             this.enableOk();
 
@@ -81,52 +83,57 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
                 }
             }, true);
 
+            this.newFileName.element.focus();
+            this.newFileName.element.select();
+
         }
     },
 
     handleNewFileDirectorySet:{
          value:function(evt){
-             if(evt.keyCode === 13){
-                 if(!this.okButton.hasAttribute("disabled")) this.handleOkButtonAction(evt);
-             }else if(evt.keyCode === 27){
-                 this.handleCancelButtonAction(evt);
-             }
-             else{
-                 this.folderUri = evt._event.newFileDirectory;
-                 if(this.isValidUri(this.folderUri)){
-                     this.enableOk();
-                 }
+             this.folderUri = evt._event.newFileDirectory;
+             if(this.isValidUri(this.folderUri)){
+                 this.enableOk();
              }
          }
      },
 
-    handlePaste:{
-        value:function(evt){
-            evt.preventDefault();
-            evt.target.value = evt.clipboardData.getData("Text");
-            this.handleNewFileNameOnkeyup(evt);
-        }
-    },
-
-    handleNewFileNameOnkeyup:{
+    handleNewFileNameChange:{
           value:function(evt){
               this.fileName = this.newFileName.value;
               if(this.isValidFileName(this.fileName)){
                       this.enableOk();
               }
-              if(evt.keyCode === 13){
-                  if(!this.okButton.hasAttribute("disabled")){
+          }
+    },
+
+    handleKeyup:{
+        value: function(evt){
+            if(evt.keyCode === 13){
+                if(!this.okButton.hasAttribute("disabled")){
                       this.handleOkButtonAction(evt);
                   }
-              }else if(evt.keyCode === 27){
-                  this.handleCancelButtonAction(evt);
+            }else if(evt.keyCode === 27){
+                this.handleCancelButtonAction(evt);
+            }
+        }
+    },
+
+    handleEnterKey:{
+        value: function(evt){
+            if((this.application.ninja.newFileController.saveAsDialog !== null)
+                  && !this.okButton.hasAttribute("disabled")){
+
+                    this.handleOkButtonAction(evt);
               }
-          }
+        }
     },
 
-    handleSearch:{
-        value:function(evt){
-            this.handleNewFileNameOnkeyup(evt);
+    handleEscKey:{
+        value: function(evt){
+            if(this.application.ninja.newFileController.saveAsDialog !== null){
+                this.handleCancelButtonAction(evt);
+            }
         }
     },
 
-- 
cgit v1.2.3