From 2371f666152f5b45f991dd1c48b915825a85eb1a Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 11 Nov 2011 23:56:49 -0800 Subject: [PATCH] Ctrl+Short+f will now open Local Search. ESC will close Local Search search. When local search text box loses focus it will close the slider. --- NzbDrone.Web/NzbDrone.Web.csproj | 1 + NzbDrone.Web/Scripts/NzbDrone/slider.js | 12 ++- NzbDrone.Web/Scripts/jquery.hotkeys.js | 99 ++++++++++++++++++++ NzbDrone.Web/Views/Shared/LocalSearch.cshtml | 14 ++- NzbDrone.Web/Views/Shared/_Layout.cshtml | 1 + 5 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 NzbDrone.Web/Scripts/jquery.hotkeys.js diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 730223fa2..eb9b2c41a 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -677,6 +677,7 @@ + diff --git a/NzbDrone.Web/Scripts/NzbDrone/slider.js b/NzbDrone.Web/Scripts/NzbDrone/slider.js index 637a58378..5a34e1d45 100644 --- a/NzbDrone.Web/Scripts/NzbDrone/slider.js +++ b/NzbDrone.Web/Scripts/NzbDrone/slider.js @@ -14,6 +14,9 @@ function sliderToggle(sliderButton) { //Change the slider Image $(sliderButton).children('.sliderImage').toggleClass('sliderOpened sliderClosed'); + //Clear the search box + $(sliderContent).children('.localSeriesLookup').val(''); + //Focus in the search box $(sliderContent).children('.localSeriesLookup').focus(); @@ -33,4 +36,11 @@ function hideSliders(newlyOpenedSlider) { if (id != newlyOpenedSliderId) $(this).slideUp(); }); -} \ No newline at end of file +} + +//Hide slider when text box loses focus +$('.localSeriesLookup').live('blur', function () { + $('.sliderContent').each(function (index, value) { + $(this).slideUp(); + }); +}); diff --git a/NzbDrone.Web/Scripts/jquery.hotkeys.js b/NzbDrone.Web/Scripts/jquery.hotkeys.js new file mode 100644 index 000000000..fbd71c71e --- /dev/null +++ b/NzbDrone.Web/Scripts/jquery.hotkeys.js @@ -0,0 +1,99 @@ +/* + * jQuery Hotkeys Plugin + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * + * Based upon the plugin by Tzury Bar Yochay: + * http://github.com/tzuryby/hotkeys + * + * Original idea by: + * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/ +*/ + +(function(jQuery){ + + jQuery.hotkeys = { + version: "0.8", + + specialKeys: { + 8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause", + 20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", + 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", + 96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7", + 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", + 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", + 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 191: "/", 224: "meta" + }, + + shiftNums: { + "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", + "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", + ".": ">", "/": "?", "\\": "|" + } + }; + + function keyHandler( handleObj ) { + // Only care when a possible input has been specified + if ( typeof handleObj.data !== "string" ) { + return; + } + + var origHandler = handleObj.handler, + keys = handleObj.data.toLowerCase().split(" "); + + handleObj.handler = function( event ) { + // Don't fire in text-accepting inputs that we didn't directly bind to + if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) || + event.target.type === "text") ) { + return; + } + + // Keypress represents characters, not special keys + var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ], + character = String.fromCharCode( event.which ).toLowerCase(), + key, modif = "", possible = {}; + + // check combinations (alt|ctrl|shift+anything) + if ( event.altKey && special !== "alt" ) { + modif += "alt+"; + } + + if ( event.ctrlKey && special !== "ctrl" ) { + modif += "ctrl+"; + } + + // TODO: Need to make sure this works consistently across platforms + if ( event.metaKey && !event.ctrlKey && special !== "meta" ) { + modif += "meta+"; + } + + if ( event.shiftKey && special !== "shift" ) { + modif += "shift+"; + } + + if ( special ) { + possible[ modif + special ] = true; + + } else { + possible[ modif + character ] = true; + possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true; + + // "$" can be triggered as "Shift+4" or "Shift+$" or just "$" + if ( modif === "shift+" ) { + possible[ jQuery.hotkeys.shiftNums[ character ] ] = true; + } + } + + for ( var i = 0, l = keys.length; i < l; i++ ) { + if ( possible[ keys[i] ] ) { + return origHandler.apply( this, arguments ); + } + } + }; + } + + jQuery.each([ "keydown", "keyup", "keypress" ], function() { + jQuery.event.special[ this ] = { add: keyHandler }; + }); + +})( jQuery ); \ No newline at end of file diff --git a/NzbDrone.Web/Views/Shared/LocalSearch.cshtml b/NzbDrone.Web/Views/Shared/LocalSearch.cshtml index fc71b200d..3f29e5913 100644 --- a/NzbDrone.Web/Views/Shared/LocalSearch.cshtml +++ b/NzbDrone.Web/Views/Shared/LocalSearch.cshtml @@ -24,4 +24,16 @@
Search
- \ No newline at end of file + + + \ No newline at end of file diff --git a/NzbDrone.Web/Views/Shared/_Layout.cshtml b/NzbDrone.Web/Views/Shared/_Layout.cshtml index 2a53825f2..39c53d802 100644 --- a/NzbDrone.Web/Views/Shared/_Layout.cshtml +++ b/NzbDrone.Web/Views/Shared/_Layout.cshtml @@ -25,6 +25,7 @@ +