diff -pruN 0~20130707+git2d51e3a9+dfsg-2/debian/changelog 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/changelog --- 0~20130707+git2d51e3a9+dfsg-2/debian/changelog 2013-07-07 12:59:12.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/changelog 2014-04-07 21:10:03.000000000 +0000 @@ -1,3 +1,12 @@ +libjs-jquery-hotkeys (0~20130707+git2d51e3a9+dfsg-2ubuntu1) trusty; urgency=medium + + * debian/patches/revert-to-0.8.patch: + - Revert to jquery-hotkeys 0.8 rather than the current git snapshot + because the snapshot breaks python-coverage HTML reports. + LP: #1301574 + + -- Michael Terry Mon, 07 Apr 2014 17:08:29 -0400 + libjs-jquery-hotkeys (0~20130707+git2d51e3a9+dfsg-2) unstable; urgency=low * Fixed debian/copyright GPL-2 and not GPL-2+ in the license text. diff -pruN 0~20130707+git2d51e3a9+dfsg-2/debian/control 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/control --- 0~20130707+git2d51e3a9+dfsg-2/debian/control 2013-07-07 12:59:12.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/control 2014-04-07 21:10:34.000000000 +0000 @@ -1,7 +1,8 @@ Source: libjs-jquery-hotkeys Section: web Priority: extra -Maintainer: Debian Javascript Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Javascript Maintainers Uploaders: Thomas Goirand Build-Depends: debhelper (>= 9) Standards-Version: 3.9.4 diff -pruN 0~20130707+git2d51e3a9+dfsg-2/debian/patches/revert-to-0.8.patch 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/patches/revert-to-0.8.patch --- 0~20130707+git2d51e3a9+dfsg-2/debian/patches/revert-to-0.8.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/patches/revert-to-0.8.patch 2014-04-07 21:07:31.000000000 +0000 @@ -0,0 +1,107 @@ +Index: libjs-jquery-hotkeys-0~20130707+git2d51e3a9+dfsg/jquery.hotkeys.js +=================================================================== +--- libjs-jquery-hotkeys-0~20130707+git2d51e3a9+dfsg.orig/jquery.hotkeys.js 2013-07-07 02:07:42.000000000 -0400 ++++ libjs-jquery-hotkeys-0~20130707+git2d51e3a9+dfsg/jquery.hotkeys.js 2014-04-07 17:07:28.655678149 -0400 +@@ -11,50 +11,44 @@ + */ + + (function(jQuery){ +- ++ + jQuery.hotkeys = { +- version: "0.8+", ++ 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", ++ 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", ++ 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", 188: ",", 190: ".", + 191: "/", 224: "meta" +- }, +- ++ }, ++ + shiftNums: { +- "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", +- "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", ++ "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", ++ "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", + ".": ">", "/": "?", "\\": "|" + } + }; + + function keyHandler( handleObj ) { +- +- var origHandler = handleObj.handler, +- //use namespace as keys so it works with event delegation as well +- //will also allow removing listeners of a specific key combination +- //and support data objects +- keys = (handleObj.namespace || "").toLowerCase().split(" "); +- keys = jQuery.map(keys, function(key) { return key.split("."); }); +- +- //no need to modify handler if no keys specified +- if (keys.length === 1 && (keys[0] === "" || keys[0] === "autocomplete")) { ++ // 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 +- // important to note that $.fn.prop is only available on jquery 1.6+ + if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) || +- event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { ++ event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { + return; + } +- ++ + // Keypress represents characters, not special keys + var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ], + character = String.fromCharCode( event.which ).toLowerCase(), +@@ -62,20 +56,20 @@ + + // check combinations (alt|ctrl|shift+anything) + if ( event.altKey && special !== "alt" ) { +- modif += "alt_"; ++ modif += "alt+"; + } + + if ( event.ctrlKey && special !== "ctrl" ) { +- modif += "ctrl_"; ++ modif += "ctrl+"; + } +- ++ + // TODO: Need to make sure this works consistently across platforms + if ( event.metaKey && !event.ctrlKey && special !== "meta" ) { +- modif += "meta_"; ++ modif += "meta+"; + } + + if ( event.shiftKey && special !== "shift" ) { +- modif += "shift_"; ++ modif += "shift+"; + } + + if ( special ) { +@@ -86,7 +80,7 @@ + possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true; + + // "$" can be triggered as "Shift+4" or "Shift+$" or just "$" +- if ( modif === "shift_" ) { ++ if ( modif === "shift+" ) { + possible[ jQuery.hotkeys.shiftNums[ character ] ] = true; + } + } diff -pruN 0~20130707+git2d51e3a9+dfsg-2/debian/patches/series 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/patches/series --- 0~20130707+git2d51e3a9+dfsg-2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/patches/series 2014-04-07 21:07:15.000000000 +0000 @@ -0,0 +1 @@ +revert-to-0.8.patch diff -pruN 0~20130707+git2d51e3a9+dfsg-2/jquery.hotkeys.js 0~20130707+git2d51e3a9+dfsg-2ubuntu1/jquery.hotkeys.js --- 0~20130707+git2d51e3a9+dfsg-2/jquery.hotkeys.js 2013-07-07 06:07:42.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/jquery.hotkeys.js 2014-04-08 03:42:46.000000000 +0000 @@ -11,50 +11,44 @@ */ (function(jQuery){ - + jQuery.hotkeys = { - version: "0.8+", + 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", + 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", + 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", 188: ",", 190: ".", 191: "/", 224: "meta" - }, - + }, + shiftNums: { - "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", - "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", + "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", + "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", ".": ">", "/": "?", "\\": "|" } }; function keyHandler( handleObj ) { - - var origHandler = handleObj.handler, - //use namespace as keys so it works with event delegation as well - //will also allow removing listeners of a specific key combination - //and support data objects - keys = (handleObj.namespace || "").toLowerCase().split(" "); - keys = jQuery.map(keys, function(key) { return key.split("."); }); - - //no need to modify handler if no keys specified - if (keys.length === 1 && (keys[0] === "" || keys[0] === "autocomplete")) { + // 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 - // important to note that $.fn.prop is only available on jquery 1.6+ if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) || - event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { + event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { return; } - + // Keypress represents characters, not special keys var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ], character = String.fromCharCode( event.which ).toLowerCase(), @@ -62,20 +56,20 @@ // check combinations (alt|ctrl|shift+anything) if ( event.altKey && special !== "alt" ) { - modif += "alt_"; + modif += "alt+"; } if ( event.ctrlKey && special !== "ctrl" ) { - modif += "ctrl_"; + modif += "ctrl+"; } - + // TODO: Need to make sure this works consistently across platforms if ( event.metaKey && !event.ctrlKey && special !== "meta" ) { - modif += "meta_"; + modif += "meta+"; } if ( event.shiftKey && special !== "shift" ) { - modif += "shift_"; + modif += "shift+"; } if ( special ) { @@ -86,7 +80,7 @@ possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true; // "$" can be triggered as "Shift+4" or "Shift+$" or just "$" - if ( modif === "shift_" ) { + if ( modif === "shift+" ) { possible[ jQuery.hotkeys.shiftNums[ character ] ] = true; } } diff -pruN 0~20130707+git2d51e3a9+dfsg-2/.pc/applied-patches 0~20130707+git2d51e3a9+dfsg-2ubuntu1/.pc/applied-patches --- 0~20130707+git2d51e3a9+dfsg-2/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/.pc/applied-patches 2014-04-08 03:42:46.039110547 +0000 @@ -0,0 +1 @@ +revert-to-0.8.patch diff -pruN 0~20130707+git2d51e3a9+dfsg-2/.pc/revert-to-0.8.patch/jquery.hotkeys.js 0~20130707+git2d51e3a9+dfsg-2ubuntu1/.pc/revert-to-0.8.patch/jquery.hotkeys.js --- 0~20130707+git2d51e3a9+dfsg-2/.pc/revert-to-0.8.patch/jquery.hotkeys.js 1970-01-01 00:00:00.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/.pc/revert-to-0.8.patch/jquery.hotkeys.js 2013-07-07 06:07:42.000000000 +0000 @@ -0,0 +1,106 @@ +/* + * 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", 188: ",", 190: ".", + 191: "/", 224: "meta" + }, + + shiftNums: { + "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", + "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", + ".": ">", "/": "?", "\\": "|" + } + }; + + function keyHandler( handleObj ) { + + var origHandler = handleObj.handler, + //use namespace as keys so it works with event delegation as well + //will also allow removing listeners of a specific key combination + //and support data objects + keys = (handleObj.namespace || "").toLowerCase().split(" "); + keys = jQuery.map(keys, function(key) { return key.split("."); }); + + //no need to modify handler if no keys specified + if (keys.length === 1 && (keys[0] === "" || keys[0] === "autocomplete")) { + return; + } + + handleObj.handler = function( event ) { + // Don't fire in text-accepting inputs that we didn't directly bind to + // important to note that $.fn.prop is only available on jquery 1.6+ + if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) || + event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { + 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 );