Disable keybinds with return.

This commit is contained in:
Nicolas Stepien 2011-06-23 23:22:42 +02:00
parent 56aa2147ef
commit 0b826d5d6d
2 changed files with 41 additions and 36 deletions

View File

@ -693,23 +693,23 @@
keybinds = { keybinds = {
init: function() { init: function() {
var key; var key;
keybinds.close = (key = $.getValue('key/close')) ? key : '<Esc>'; keybinds.close = (key = $.getValue('key/close', 0)).length ? key : '<Esc>';
keybinds.spoiler = (key = $.getValue('key/spoiler')) ? key : '^s'; keybinds.spoiler = (key = $.getValue('key/spoiler', 0)).length ? key : '^s';
keybinds.zero = (key = $.getValue('key/zero')) ? key : '0'; keybinds.zero = (key = $.getValue('key/zero', 0)).length ? key : '0';
keybinds.openQR = (key = $.getValue('key/openQR')) ? key : 'i'; keybinds.openQR = (key = $.getValue('key/openQR', 0)).length ? key : 'i';
keybinds.openEmptyQR = (key = $.getValue('key/openEmptyQR')) ? key : 'I'; keybinds.openEmptyQR = (key = $.getValue('key/openEmptyQR', 0)).length ? key : 'I';
keybinds.nextReply = (key = $.getValue('key/nextReply')) ? key : 'J'; keybinds.nextReply = (key = $.getValue('key/nextReply', 0)).length ? key : 'J';
keybinds.previousReply = (key = $.getValue('key/previousReply')) ? key : 'K'; keybinds.previousReply = (key = $.getValue('key/previousReply', 0)).length ? key : 'K';
keybinds.nextThread = (key = $.getValue('key/nextThread')) ? key : 'n'; keybinds.nextThread = (key = $.getValue('key/nextThread', 0)).length ? key : 'n';
keybinds.previousThread = (key = $.getValue('key/previousThread')) ? key : 'p'; keybinds.previousThread = (key = $.getValue('key/previousThread', 0)).length ? key : 'p';
keybinds.openThreadTab = (key = $.getValue('key/openThreadTab')) ? key : 'o'; keybinds.openThreadTab = (key = $.getValue('key/openThreadTab', 0)).length ? key : 'o';
keybinds.openThread = (key = $.getValue('key/openThread')) ? key : 'O'; keybinds.openThread = (key = $.getValue('key/openThread', 0)).length ? key : 'O';
keybinds.expandThread = (key = $.getValue('key/expandThread')) ? key : 'e'; keybinds.expandThread = (key = $.getValue('key/expandThread', 0)).length ? key : 'e';
keybinds.watch = (key = $.getValue('key/watch')) ? key : 'w'; keybinds.watch = (key = $.getValue('key/watch', 0)).length ? key : 'w';
keybinds.hide = (key = $.getValue('key/hide')) ? key : 'x'; keybinds.hide = (key = $.getValue('key/hide', 0)).length ? key : 'x';
keybinds.expandImages = (key = $.getValue('key/expandImages')) ? key : 'm'; keybinds.expandImages = (key = $.getValue('key/expandImages', 0)).length ? key : 'm';
keybinds.expandAllImages = (key = $.getValue('key/expandAllImages')) ? key : 'M'; keybinds.expandAllImages = (key = $.getValue('key/expandAllImages', 0)).length ? key : 'M';
keybinds.update = (key = $.getValue('key/update')) ? key : 'u'; keybinds.update = (key = $.getValue('key/update', 0)).length ? key : 'u';
$.bind(d, 'keydown', keybinds.cb.keydown); $.bind(d, 'keydown', keybinds.cb.keydown);
return $.bind(d, 'keypress', keybinds.cb.keypress); return $.bind(d, 'keypress', keybinds.cb.keypress);
}, },
@ -1042,7 +1042,7 @@
for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) { for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) {
input = _ref4[_k]; input = _ref4[_k];
$.bind(input, 'keydown', options.cb.keybind); $.bind(input, 'keydown', options.cb.keybind);
if (key = $.getValue("key/" + input.name, 0)) { if ((key = $.getValue("key/" + input.name, 0)).length >= 0) {
input.value = key; input.value = key;
} }
} }
@ -1103,6 +1103,9 @@
key = '<Esc>'; key = '<Esc>';
} else if ((48 <= kc && kc <= 57)) { } else if ((48 <= kc && kc <= 57)) {
key = String.fromCharCode(kc); key = String.fromCharCode(kc);
}
if (kc === 8) {
key = '';
} else { } else {
key = this.value; key = this.value;
} }

View File

@ -489,23 +489,23 @@ replyHiding =
keybinds = keybinds =
init: -> init: ->
keybinds.close = if key = $.getValue 'key/close' then key else '<Esc>' keybinds.close = if (key = $.getValue 'key/close', 0).length then key else '<Esc>'
keybinds.spoiler = if key = $.getValue 'key/spoiler' then key else '^s' keybinds.spoiler = if (key = $.getValue 'key/spoiler', 0).length then key else '^s'
keybinds.zero = if key = $.getValue 'key/zero' then key else '0' keybinds.zero = if (key = $.getValue 'key/zero', 0).length then key else '0'
keybinds.openQR = if key = $.getValue 'key/openQR' then key else 'i' keybinds.openQR = if (key = $.getValue 'key/openQR', 0).length then key else 'i'
keybinds.openEmptyQR = if key = $.getValue 'key/openEmptyQR' then key else 'I' keybinds.openEmptyQR = if (key = $.getValue 'key/openEmptyQR', 0).length then key else 'I'
keybinds.nextReply = if key = $.getValue 'key/nextReply' then key else 'J' keybinds.nextReply = if (key = $.getValue 'key/nextReply', 0).length then key else 'J'
keybinds.previousReply = if key = $.getValue 'key/previousReply' then key else 'K' keybinds.previousReply = if (key = $.getValue 'key/previousReply', 0).length then key else 'K'
keybinds.nextThread = if key = $.getValue 'key/nextThread' then key else 'n' keybinds.nextThread = if (key = $.getValue 'key/nextThread', 0).length then key else 'n'
keybinds.previousThread = if key = $.getValue 'key/previousThread' then key else 'p' keybinds.previousThread = if (key = $.getValue 'key/previousThread', 0).length then key else 'p'
keybinds.openThreadTab = if key = $.getValue 'key/openThreadTab' then key else 'o' keybinds.openThreadTab = if (key = $.getValue 'key/openThreadTab', 0).length then key else 'o'
keybinds.openThread = if key = $.getValue 'key/openThread' then key else 'O' keybinds.openThread = if (key = $.getValue 'key/openThread', 0).length then key else 'O'
keybinds.expandThread = if key = $.getValue 'key/expandThread' then key else 'e' keybinds.expandThread = if (key = $.getValue 'key/expandThread', 0).length then key else 'e'
keybinds.watch = if key = $.getValue 'key/watch' then key else 'w' keybinds.watch = if (key = $.getValue 'key/watch', 0).length then key else 'w'
keybinds.hide = if key = $.getValue 'key/hide' then key else 'x' keybinds.hide = if (key = $.getValue 'key/hide', 0).length then key else 'x'
keybinds.expandImages = if key = $.getValue 'key/expandImages' then key else 'm' keybinds.expandImages = if (key = $.getValue 'key/expandImages', 0).length then key else 'm'
keybinds.expandAllImages = if key = $.getValue 'key/expandAllImages' then key else 'M' keybinds.expandAllImages = if (key = $.getValue 'key/expandAllImages', 0).length then key else 'M'
keybinds.update = if key = $.getValue 'key/update' then key else 'u' keybinds.update = if (key = $.getValue 'key/update', 0).length then key else 'u'
$.bind d, 'keydown', keybinds.cb.keydown $.bind d, 'keydown', keybinds.cb.keydown
$.bind d, 'keypress', keybinds.cb.keypress $.bind d, 'keypress', keybinds.cb.keypress
@ -840,7 +840,7 @@ options =
$.bind $('input[name=time]', dialog), 'keyup', options.cb.time $.bind $('input[name=time]', dialog), 'keyup', options.cb.time
for input in $$ '#keybinds input', dialog for input in $$ '#keybinds input', dialog
$.bind input, 'keydown', options.cb.keybind $.bind input, 'keydown', options.cb.keybind
if key = $.getValue "key/#{input.name}", 0 if (key = $.getValue "key/#{input.name}", 0).length >= 0
input.value = key input.value = key
### ###
@ -888,6 +888,8 @@ options =
key = '<Esc>' key = '<Esc>'
else if 48 <= kc <= 57 #0-9 else if 48 <= kc <= 57 #0-9
key = String.fromCharCode kc key = String.fromCharCode kc
if kc is 8
key = ''
else else
key = @value key = @value
@value = key @value = key