mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 02:10:08 +00:00
bugfix...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
66a21fa5d9
commit
b4ba458b62
@ -600,18 +600,14 @@ var KeyboardActions = actions.Actions({
|
|||||||
ms: 1,
|
ms: 1,
|
||||||
s: 1000,
|
s: 1000,
|
||||||
m: 1000 * 60,
|
m: 1000 * 60,
|
||||||
//h: 1000 * 60 * 60,
|
|
||||||
|
|
||||||
// just for fun...
|
|
||||||
hz: function(v){ return 1000 / v },
|
hz: function(v){ return 1000 / v },
|
||||||
//khz: function(v){ return 1 / v },
|
|
||||||
}
|
}
|
||||||
txt = txt.replace(/^\s*@([^\s]*)\s*/,
|
txt = txt.replace(/^\s*@([^\s]*)\s*/,
|
||||||
function(_, time){
|
function(_, time){
|
||||||
var unit = time
|
var unit = time
|
||||||
.replace(/(\d+|\d*\.\d+)([^\s]*)/, '$2')
|
.replace(/(\d+|\d*\.\d+)([^\s]*)/, '$2')
|
||||||
.toLowerCase()
|
.toLowerCase()
|
||||||
unit = unit == time ? 'ms' : unit
|
unit = unit == '' ? 'ms' : unit
|
||||||
debounce = scale[unit] instanceof Function ?
|
debounce = scale[unit] instanceof Function ?
|
||||||
scale[unit](parseFloat(time))
|
scale[unit](parseFloat(time))
|
||||||
: parseFloat(time) * scale[unit]
|
: parseFloat(time) * scale[unit]
|
||||||
@ -658,7 +654,6 @@ var KeyboardActions = actions.Actions({
|
|||||||
|
|
||||||
// XXX we should also check if code is a key (i.e. alias)...
|
// XXX we should also check if code is a key (i.e. alias)...
|
||||||
|
|
||||||
//var a = keyboard.parseActionCall(code, that)
|
|
||||||
var a = that.parseStringHandler(code, that)
|
var a = that.parseStringHandler(code, that)
|
||||||
// skip aliases that look like actions (namely ':') and bad actions...
|
// skip aliases that look like actions (namely ':') and bad actions...
|
||||||
if(a.action == ''){
|
if(a.action == ''){
|
||||||
@ -821,7 +816,6 @@ var KeyboardActions = actions.Actions({
|
|||||||
// - .no_default
|
// - .no_default
|
||||||
// - .stop_propagation
|
// - .stop_propagation
|
||||||
var normalizeHandler = function(action){
|
var normalizeHandler = function(action){
|
||||||
//var a = keyboard.parseActionCall(action.doc || action, that)
|
|
||||||
var a = that.parseStringHandler(action.doc || action, that)
|
var a = that.parseStringHandler(action.doc || action, that)
|
||||||
return a.action in that ?
|
return a.action in that ?
|
||||||
a.action
|
a.action
|
||||||
@ -1151,7 +1145,6 @@ var KeyboardUIActions = actions.Actions({
|
|||||||
var c = 0
|
var c = 0
|
||||||
Object.keys(keys[mode] || {}).forEach(function(action){
|
Object.keys(keys[mode] || {}).forEach(function(action){
|
||||||
|
|
||||||
//var o = keyboard.parseActionCall(action, that)
|
|
||||||
var o = that.parseStringHandler(action, that)
|
var o = that.parseStringHandler(action, that)
|
||||||
|
|
||||||
if(getKeyText){
|
if(getKeyText){
|
||||||
@ -1503,7 +1496,6 @@ var KeyboardUIActions = actions.Actions({
|
|||||||
['⋯', function(evt, elem){
|
['⋯', function(evt, elem){
|
||||||
code = code || ''
|
code = code || ''
|
||||||
// highlight the current action...
|
// highlight the current action...
|
||||||
//var a = keyboard.parseActionCall(code, that)
|
|
||||||
var a = that.parseStringHandler(code, that)
|
var a = that.parseStringHandler(code, that)
|
||||||
var p = a.action in that ?
|
var p = a.action in that ?
|
||||||
that.getDocPath(a.action)
|
that.getDocPath(a.action)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user