Merge branch 'v3'
Conflicts: src/Images/FappeTyme.coffee
This commit is contained in:
commit
68bc40cc45
@ -9810,7 +9810,7 @@
|
||||
}));
|
||||
Header.addShortcut(el, true);
|
||||
if (Conf[lc]) {
|
||||
FappeTyme.cb.set(type);
|
||||
FappeTyme.cb.set(lc);
|
||||
}
|
||||
}
|
||||
return Post.callbacks.push({
|
||||
|
||||
@ -9796,7 +9796,7 @@
|
||||
}));
|
||||
Header.addShortcut(el, true);
|
||||
if (Conf[lc]) {
|
||||
FappeTyme.cb.set(type);
|
||||
FappeTyme.cb.set(lc);
|
||||
}
|
||||
}
|
||||
return Post.callbacks.push({
|
||||
|
||||
@ -16,7 +16,7 @@ FappeTyme =
|
||||
|
||||
$.on el, 'click', FappeTyme.cb.toggle.bind {name: "#{lc}"}
|
||||
Header.addShortcut el, true
|
||||
FappeTyme.cb.set type if Conf[lc]
|
||||
FappeTyme.cb.set lc if Conf[lc]
|
||||
|
||||
Post.callbacks.push
|
||||
name: 'Fappe Tyme'
|
||||
@ -34,4 +34,4 @@ FappeTyme =
|
||||
toggle: ->
|
||||
Conf[@name] = !Conf[@name]
|
||||
FappeTyme.cb.set @name
|
||||
$.cb.checked.call {name: @name, checked: Conf[@name]}
|
||||
$.cb.checked.call {name: @name, checked: Conf[@name]}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user