Merge branch 'master' of github.com:aeosynth/4chan-x
This commit is contained in:
commit
f185c99288
@ -1077,7 +1077,7 @@
|
||||
_ref4 = $$('#keybinds input', dialog);
|
||||
for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) {
|
||||
input = _ref4[_k];
|
||||
input.value = $.getValue("key/" + input.name, config.hotkeys[input.name]);
|
||||
input.value = conf[input.name];
|
||||
$.bind(input, 'keydown', options.keybind);
|
||||
}
|
||||
/*
|
||||
@ -1129,8 +1129,8 @@
|
||||
}
|
||||
}
|
||||
this.value = key;
|
||||
$.setValue("key/" + this.name, key);
|
||||
return keybinds[this.name] = key;
|
||||
$.setValue(this.name, key);
|
||||
return conf[this.name] = key;
|
||||
}
|
||||
},
|
||||
time: function(e) {
|
||||
|
||||
@ -848,7 +848,7 @@ options =
|
||||
$.bind $('textarea[name=flavors]', dialog), 'change', $.cb.value
|
||||
$.bind $('input[name=time]', dialog), 'keyup', options.time
|
||||
for input in $$ '#keybinds input', dialog
|
||||
input.value = $.getValue "key/#{input.name}", config.hotkeys[input.name]
|
||||
input.value = conf[input.name]
|
||||
$.bind input, 'keydown', options.keybind
|
||||
|
||||
###
|
||||
@ -890,8 +890,8 @@ options =
|
||||
key = 'alt+' + key if e.altKey
|
||||
key = 'ctrl+' + key if e.ctrlKey
|
||||
@value = key
|
||||
$.setValue "key/#{@name}", key
|
||||
keybinds[@name] = key
|
||||
$.setValue @name, key
|
||||
conf[@name] = key
|
||||
time: (e) ->
|
||||
$.setValue 'time', @value
|
||||
Time.foo()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user