Merge branch 'v3'

Conflicts:
	src/Images/FappeTyme.coffee
This commit is contained in:
Zixaphir 2013-12-16 14:12:42 -07:00
commit 68bc40cc45
3 changed files with 4 additions and 4 deletions

View File

@ -9810,7 +9810,7 @@
}));
Header.addShortcut(el, true);
if (Conf[lc]) {
FappeTyme.cb.set(type);
FappeTyme.cb.set(lc);
}
}
return Post.callbacks.push({

View File

@ -9796,7 +9796,7 @@
}));
Header.addShortcut(el, true);
if (Conf[lc]) {
FappeTyme.cb.set(type);
FappeTyme.cb.set(lc);
}
}
return Post.callbacks.push({

View File

@ -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]}