Skip to content

Commit 49a8c07

Browse files
bump version 1.3.1
1 parent afdd165 commit 49a8c07

File tree

6 files changed

+26
-13
lines changed

6 files changed

+26
-13
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-hotkeys",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"main": [
55
"build/hotkeys.min.js",
66
"build/hotkeys.min.css"

build/hotkeys.css

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
/*!
2-
* angular-hotkeys v1.3.0
2+
* angular-hotkeys v1.3.1
33
* https://chieffancypants.github.io/angular-hotkeys
44
* Copyright (c) 2014 Wes Cruver
55
* License: MIT
66
*/
77
.cfp-hotkeys-container {
88
display: table;
99
position: fixed;
10-
z-index: -1024;
1110
width: 100%;
1211
height: 100%;
1312
top: 0;
@@ -17,8 +16,20 @@
1716
background-color: rgba(255,255,255,0.9);
1817
}
1918

19+
.cfp-hotkeys-container.fade {
20+
z-index: -1024;
21+
visibility: hidden;
22+
opacity: 0;
23+
-webkit-transition: opacity 0.15s linear;
24+
-moz-transition: opacity 0.15s linear;
25+
-o-transition: opacity 0.15s linear;
26+
transition: opacity 0.15s linear;
27+
}
28+
2029
.cfp-hotkeys-container.fade.in {
21-
z-index: 1024;
30+
z-index: 10002;
31+
visibility: visible;
32+
opacity: 1;
2233
}
2334

2435
.cfp-hotkeys-title {

build/hotkeys.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-hotkeys v1.3.0
2+
* angular-hotkeys v1.3.1
33
* https://chieffancypants.github.io/angular-hotkeys
44
* Copyright (c) 2014 Wes Cruver
55
* License: MIT
@@ -109,16 +109,18 @@
109109
* @param {String} description Description for the keycombo
110110
* @param {Function} callback function to execute when keycombo pressed
111111
* @param {string} action the type of event to listen for (for mousetrap)
112+
* @param {array} allowIn an array of tag names to allow this combo in ('INPUT', 'SELECT', and/or 'TEXTAREA')
112113
* @param {Boolean} persistent Whether the hotkey persists navigation events
113114
*/
114-
function Hotkey (combo, description, callback, action, persistent) {
115+
function Hotkey (combo, description, callback, action, allowIn, persistent) {
115116
// TODO: Check that the values are sane because we could
116117
// be trying to instantiate a new Hotkey with outside dev's
117118
// supplied values
118119
this.combo = combo;
119120
this.description = description;
120121
this.callback = callback;
121122
this.action = action;
123+
this.allowIn = allowIn;
122124
this.persistent = persistent;
123125
}
124126

@@ -190,7 +192,7 @@
190192

191193
// todo: perform check to make sure not already defined:
192194
// this came from a route, so it's likely not meant to be persistent
193-
hotkey[4] = false;
195+
hotkey[5] = false;
194196
_add.apply(this, hotkey);
195197
});
196198
}
@@ -358,8 +360,8 @@
358360
} else {
359361
Mousetrap.bind(combo, wrapApply(callback));
360362
}
361-
scope.hotkeys.push(new Hotkey(combo, description, callback, action, allowIn, persistent));
362363

364+
scope.hotkeys.push(new Hotkey(combo, description, callback, action, allowIn, persistent));
363365
}
364366

365367
/**

build/hotkeys.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)