Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:aeosynth/4chan-x

Browse Source
This commit is contained in:
Nicolas Stepien 2011-07-24 07:48:53 +02:00
commit f185c99288
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
4chan_x.user.js
View File

@ -1077,7 +1077,7 @@
_ref4 = $$('#keybinds input', dialog); _ref4 = $$('#keybinds input', dialog);
for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) { for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) {
input = _ref4[_k]; input = _ref4[_k];
input.value = $.getValue("key/" + input.name, config.hotkeys[input.name]); input.value = conf[input.name];
$.bind(input, 'keydown', options.keybind); $.bind(input, 'keydown', options.keybind);
} }
/* /*
@ -1129,8 +1129,8 @@
} }
} }
this.value = key; this.value = key;
$.setValue("key/" + this.name, key); $.setValue(this.name, key);
return keybinds[this.name] = key; return conf[this.name] = key;
} }
}, },
time: function(e) { time: function(e) {

6
script.coffee
View File

@ -848,7 +848,7 @@ options =
$.bind $('textarea[name=flavors]', dialog), 'change', $.cb.value $.bind $('textarea[name=flavors]', dialog), 'change', $.cb.value
$.bind $('input[name=time]', dialog), 'keyup', options.time $.bind $('input[name=time]', dialog), 'keyup', options.time
for input in $$ '#keybinds input', dialog 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 $.bind input, 'keydown', options.keybind
### ###
@ -890,8 +890,8 @@ options =
key = 'alt+' + key if e.altKey key = 'alt+' + key if e.altKey
key = 'ctrl+' + key if e.ctrlKey key = 'ctrl+' + key if e.ctrlKey
@value = key @value = key
$.setValue "key/#{@name}", key $.setValue @name, key
keybinds[@name] = key conf[@name] = key
time: (e) -> time: (e) ->
$.setValue 'time', @value $.setValue 'time', @value
Time.foo() Time.foo()