From 2557f463c1cfe2d0dd8ea187c184755bd141dab4 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 22 Mar 2012 10:38:44 -0700
Subject: IKNINJA-1302 : For File>New and File>SaveAll dialogs, 'ESC' key now
triggers Cancel button and 'Enter' key now triggers OK button. For File
picker, the 'ESC' now triggers the Cancel button.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Conflicts:
js/io/ui/new-file-dialog/new-file-workflow-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/io/ui/file-picker/picker-navigator.reel')
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index 7a9d90b4..e31fa29d 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -258,7 +258,6 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
this.element.addEventListener("refreshTreeSegment", function(evt){that.handlePickerNavRefreshTreeSegment(evt);}, false);
this.resultsArea.addEventListener("click", function(evt){that.handleResultsAreaClick(evt);}, false);
this.element.addEventListener("click", function(evt){that.handlePickerNavClick(evt);}, false);
-
this.okButton.addEventListener("click", function(evt){that.handleOkButtonAction(evt);}, false);
this.cancelButton.addEventListener("click", function(evt){that.handleCancelButtonAction(evt);}, false);
@@ -1071,6 +1070,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
//clear memory - TODO:check for more memory leaks
this.pickerModel = null;
this.application.ninja.filePickerController._directoryContentCache = {};
+ this.application.ninja.filePickerController.pickerNavChoices = null;
//remove listeners
this.element.removeEventListener("openFolder", this, false);//add icon double click event listener to reload iconList with new set of data
this.element.removeEventListener("selectedItem", this, false);//for single selection only
--
cgit v1.2.3
From 85bf9f937fa2ec46e42f791fc6815f7c2f5446ea Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 22 Mar 2012 10:42:05 -0700
Subject: file picker - added size unit new file - don't disable OK is file
exists
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/io/ui/file-picker/picker-navigator.reel')
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index e31fa29d..3cf6fc5a 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -500,7 +500,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
metadata = "Name: "+data.name;
}
metadata = metadata + "<br />" + "Type: "+data.type;
- if(data.size){metadata = metadata + "<br />" + "Size: "+data.size;}
+ if(data.size){metadata = metadata + "<br />" + "Size: "+data.size+" bytes";}
if(data.creationDate){metadata = metadata + "<br />" + "Creation date: "+ this.formatTimestamp(data.creationDate);}
if(data.modifiedDate){metadata = metadata + "<br />" + "Modified date: "+ this.formatTimestamp(data.modifiedDate);}
}
--
cgit v1.2.3
From 80ceeffeb3dd3227008714b8b56383f9556ff409 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 22 Mar 2012 14:49:17 -0700
Subject: KNINJA-1302 : refactored fixed as per request
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'js/io/ui/file-picker/picker-navigator.reel')
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index 3cf6fc5a..945b0301 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -261,8 +261,17 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
this.okButton.addEventListener("click", function(evt){that.handleOkButtonAction(evt);}, false);
this.cancelButton.addEventListener("click", function(evt){that.handleCancelButtonAction(evt);}, false);
+ this.element.addEventListener("keyup", function(evt){
+ if(evt.keyCode == 27) {
+ if(that.application.ninja.filePickerController.pickerNavChoices !== null){
+ that.handleCancelButtonAction();
+ }
+ }
+ }, true);
+
//ready to show picker now
this.element.style.visibility = "visible";
+ this.element.focus();
}
},
--
cgit v1.2.3