flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-31 11:20:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaking and fixes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2017-04-22 07:06:14 +03:00
parent d0f0894da2
commit d4becb9b5e
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui (gen4)/lib/keyboard.js
View File

@ -782,10 +782,12 @@ var KeyboardPrototype = {
// - shifted keys first // - shifted keys first
// - modifiers are skipped in order, left to right // - modifiers are skipped in order, left to right
// XXX carefully revise key search order... // XXX carefully revise key search order...
var keyCombinations = function(key, shift_key){ var keyCombinations = function(key, shift_key, remove_single_keys){
if(key.length <= 1){ if(key.length <= 1){
return key //return shift_key ? [key, shift_key] : [key]
return key
} }
var k = remove_single_keys ? 1 : 0
// generate recursively, breadth first... // generate recursively, breadth first...
var _combinations = function(level, res){ var _combinations = function(level, res){
var next = [] var next = []
@ -799,7 +801,10 @@ var KeyboardPrototype = {
.map(function(_, i){ .map(function(_, i){
var s = elem.slice() var s = elem.slice()
s.splice(i, 1) s.splice(i, 1)
s.length > 0 // NOTE: we do not include single keys
// as they are searched separately...
//s.length > 0
s.length > k
&& next.push(s) && next.push(s)
}) })
}) })
@ -845,9 +850,12 @@ var KeyboardPrototype = {
// match candidates... // match candidates...
//var keys = joinKeys(key, shift_key).unique() //var keys = joinKeys(key, shift_key).unique()
var keys = keyCombinations(key, shift_key) // NOTE: we are skipping single keys from list as they are searched
// separately...
var keys = keyCombinations(key, shift_key, true)
console.log(keys) // XXX
//console.log(keys, '--', joinKeys(key, shift_key).unique())
// get modes... // get modes...
var modes = mode == '*' ? Object.keys(keyboard) var modes = mode == '*' ? Object.keys(keyboard)
@ -862,7 +870,7 @@ var KeyboardPrototype = {
var c = this.key2code(k) var c = this.key2code(k)
//var mod = joinKeys(key.slice(0, -1).concat('')) //var mod = joinKeys(key.slice(0, -1).concat(''))
var mod = keyCombinations(key.slice(0, -1).concat('')) var mod = keyCombinations(key.slice(0, -1).concat(''), null, true)
var drop = mode == 'test' || mode == '?' var drop = mode == 'test' || mode == '?'
for(var i=0; i < modes.length; i++){ for(var i=0; i < modes.length; i++){