From 842bca74f982c4fb348285b8a0bc439ffb89a20f Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Fri, 14 Sep 2012 23:24:22 +0200
Subject: [PATCH] Improves filter. Still problems with filter and preview.

---
 README.md                           |  2 ++
 src/_h5ai/js/inc/ext/filter.js      | 17 +++++++++++++++++
 src/_h5ai/js/inc/ext/preview-img.js |  9 ++++++---
 src/_h5ai/js/inc/ext/preview-txt.js |  8 ++++++--
 src/_h5ai/js/inc/view/extended.js   |  2 +-
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index cf9a7ab8..fc3e8b77 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,8 @@ Run `makejs -t` to list all possible targets.
 * adds drag'n'drop upload (PHP)
 * adds file deletion (PHP)
 * PHP ignore patterns might include paths now
+* adds optional binary prefixes for file sizes
+* improves filter: autofocus on keypress, clear on `ESC`
 * temp download packages are now stored in the `_h5ai/cache` and deleted as soon as possible
 * localization now in separate files
 * updates translations
diff --git a/src/_h5ai/js/inc/ext/filter.js b/src/_h5ai/js/inc/ext/filter.js
index ec75b5ce..758d9033 100644
--- a/src/_h5ai/js/inc/ext/filter.js
+++ b/src/_h5ai/js/inc/ext/filter.js
@@ -121,6 +121,23 @@ modulejs.define('ext/filter', ['_', '$', 'core/settings', 'core/resource'], func
 					checkState(false);
 				})
 				.on('keyup', update);
+
+			$(document)
+				.on('keydown', function (event) {
+
+					if (event.which === 27) {
+						$input.attr('value','').blur();
+						checkState(false);
+					}
+				})
+				.on('keypress', function (event) {
+
+					$input.focus();
+				})
+				.on('keyup', function (event) {
+
+					checkState(false);
+				});
 		};
 
 	init();
diff --git a/src/_h5ai/js/inc/ext/preview-img.js b/src/_h5ai/js/inc/ext/preview-img.js
index 64c50a71..731d73d3 100644
--- a/src/_h5ai/js/inc/ext/preview-img.js
+++ b/src/_h5ai/js/inc/ext/preview-img.js
@@ -198,6 +198,9 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource',
 			} else if (key === 70) { // f
 				onFullscreen();
 			}
+
+			event.stopImmediatePropagation();
+			return false;
 		},
 
 		initEntry = function (entry) {
@@ -234,7 +237,6 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource',
 			$('#pv-img-bar-next, #pv-img-next').on('click', onNext);
 			$('#pv-img-bar-close, #pv-img-close').on('click', onExit);
 			$('#pv-img-bar-fullscreen').on('click', onFullscreen);
-			$('#pv-img-overlay').on('keydown', onKeydown);
 
 			$('#pv-img-prev')
 				.on('mouseenter', function () {
@@ -260,11 +262,12 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource',
 					$('#pv-img-bar-close').removeClass('hover');
 				});
 
-
 			$('#pv-img-overlay')
+				.on('keydown', onKeydown)
 				.on('click mousedown mousemove keydown keypress', function (event) {
 
-					event.stopPropagation();
+					event.stopImmediatePropagation();
+					return false;
 				})
 				.on('mousemove', function (event) {
 
diff --git a/src/_h5ai/js/inc/ext/preview-txt.js b/src/_h5ai/js/inc/ext/preview-txt.js
index cfc6429b..2cce9b25 100644
--- a/src/_h5ai/js/inc/ext/preview-txt.js
+++ b/src/_h5ai/js/inc/ext/preview-txt.js
@@ -205,6 +205,9 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource',
 			} else if (key === 13 || key === 32 || key === 38 || key === 39) { // enter, space, up, right
 				onNext();
 			}
+
+			event.stopImmediatePropagation();
+			return false;
 		},
 
 		initEntry = function (entry) {
@@ -240,7 +243,6 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource',
 			$('#pv-txt-bar-prev').on('click', onPrevious);
 			$('#pv-txt-bar-next').on('click', onNext);
 			$('#pv-txt-bar-close, #pv-txt-close').on('click', onExit);
-			$('#pv-txt-overlay').on('keydown', onKeydown);
 
 			$('#pv-txt-close')
 				.on('mouseenter', function () {
@@ -252,9 +254,11 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource',
 
 
 			$('#pv-txt-overlay')
+				.on('keydown', onKeydown)
 				.on('click mousedown mousemove keydown keypress', function (event) {
 
-					event.stopPropagation();
+					event.stopImmediatePropagation();
+					return false;
 				});
 
 			event.sub('entry.created', function (entry) {
diff --git a/src/_h5ai/js/inc/view/extended.js b/src/_h5ai/js/inc/view/extended.js
index feef83b1..a766c8c2 100644
--- a/src/_h5ai/js/inc/view/extended.js
+++ b/src/_h5ai/js/inc/view/extended.js
@@ -104,7 +104,7 @@ modulejs.define('view/extended', ['_', '$', 'core/settings', 'core/resource', 'c
 				$ul = $(listTemplate),
 				$emtpy = $(emptyTemplate);
 
-			format.setDefaultMetric(settings.binaryUnits);
+			format.setDefaultMetric(settings.binaryPrefix);
 
 			if (entry.parent) {
 				$ul.append(update(entry.parent));