"Fix" Fappe/Werk Tyme and actually fix Werk Tyme.

This commit is contained in:
Zixaphir 2013-12-16 13:36:19 -07:00
parent a719bbde38
commit 545a1f346f
6 changed files with 88 additions and 81 deletions

View File

@ -44,6 +44,9 @@
- You cannot post an image reply immediately after a non-image reply anymore. - You cannot post an image reply immediately after a non-image reply anymore.
- Various minor fixes - Various minor fixes
**Zixaphir**:
- FappeTyme and WerkTyme now persist across sessions.
### v1.2.43 ### v1.2.43
*2013-11-10* *2013-11-10*

View File

@ -252,6 +252,10 @@
MD5: '' MD5: ''
}, },
sauces: "https://www.google.com/searchbyimage?image_url=%TURL\nhttp://iqdb.org/?url=%TURL\n#//tineye.com/search?url=%TURL\n#http://saucenao.com/search.php?url=%TURL\n#http://3d.iqdb.org/?url=%TURL\n#http://regex.info/exif.cgi?imgurl=%URL\n# uploaders:\n#http://imgur.com/upload?url=%URL;text:Upload to imgur\n#http://ompldr.org/upload?url1=%URL;text:Upload to ompldr\n# \"View Same\" in archives:\n#//archive.foolz.us/_/search/image/%MD5/;text:View same on foolz\n#//archive.foolz.us/%board/search/image/%MD5/;text:View same on foolz /%board/\n#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/", sauces: "https://www.google.com/searchbyimage?image_url=%TURL\nhttp://iqdb.org/?url=%TURL\n#//tineye.com/search?url=%TURL\n#http://saucenao.com/search.php?url=%TURL\n#http://3d.iqdb.org/?url=%TURL\n#http://regex.info/exif.cgi?imgurl=%URL\n# uploaders:\n#http://imgur.com/upload?url=%URL;text:Upload to imgur\n#http://ompldr.org/upload?url1=%URL;text:Upload to ompldr\n# \"View Same\" in archives:\n#//archive.foolz.us/_/search/image/%MD5/;text:View same on foolz\n#//archive.foolz.us/%board/search/image/%MD5/;text:View same on foolz /%board/\n#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/",
FappeT: {
fappe: false,
werk: true
},
'sageEmoji': '4chan SS', 'sageEmoji': '4chan SS',
'emojiPos': 'before', 'emojiPos': 'before',
'Custom CSS': false, 'Custom CSS': false,
@ -7447,36 +7451,32 @@
FappeTyme = { FappeTyme = {
init: function() { init: function() {
var el, input; var el, input, lc, type, _i, _len, _ref;
if (!(Conf['Fappe Tyme'] || Conf['Werk Tyme']) || g.VIEW === 'catalog' || g.BOARD === 'f') { if (!(Conf['Fappe Tyme'] || Conf['Werk Tyme']) || g.VIEW === 'catalog' || g.BOARD === 'f') {
return; return;
} }
if (Conf['Fappe Tyme']) { _ref = ["Fappe", "Werk"];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
type = _ref[_i];
if (!Conf["" + type + " Tyme"]) {
continue;
}
lc = type.toLowerCase();
el = $.el('label', { el = $.el('label', {
innerHTML: "<input type=checkbox name=fappe-tyme> Fappe Tyme", innerHTML: "<input type=checkbox name=" + lc + "> " + type + " Tyme",
title: 'Fappe Tyme' title: "" + type + " Tyme"
}); });
FappeTyme.fappe = input = el.firstElementChild; FappeTyme[lc] = input = el.firstElementChild;
$.on(input, 'change', FappeTyme.cb.fappe); $.on(input, 'change', FappeTyme.cb.toggle.bind(input));
$.event('AddMenuEntry', { $.event('AddMenuEntry', {
type: 'header', type: 'header',
el: el, el: el,
order: 97 order: 97
}); });
} if (Conf[lc]) {
if (Conf['Werk Tyme']) { FappeTyme.cb.set(type);
el = $.el('label', { }
innerHTML: "<input type=checkbox name=werk-tyme> Werk Tyme",
title: 'Werk Tyme'
});
FappeTyme.werk = input = el.firstElementChild;
$.on(input, 'change', FappeTyme.cb.werk);
$.event('AddMenuEntry', {
type: 'header',
el: el,
order: 98
});
} }
return Post.callbacks.push({ return Post.callbacks.push({
name: 'Fappe Tyme', name: 'Fappe Tyme',
@ -7490,13 +7490,14 @@
return $.addClass(this.nodes.root, "noFile"); return $.addClass(this.nodes.root, "noFile");
}, },
cb: { cb: {
fappe: function() { set: function(type) {
$.toggleClass(doc, 'fappeTyme'); FappeTyme[type].checked = Conf[type];
return FappeTyme.fappe.checked = $.hasClass(doc, 'fappeTyme'); return $["" + (Conf[type] ? 'add' : 'rm') + "Class"](doc, "" + type + "Tyme");
}, },
werk: function() { toggle: function() {
$.toggleClass(doc, 'werkTyme'); Conf[this.name] = !Conf[this.name];
return FappeTyme.werk.checked = $.hasClass(doc, 'werkTyme'); FappeTyme.cb.set(this.name);
return $.cb.checked.call(FappeTyme[this.name]);
} }
} }
}; };
@ -11277,10 +11278,14 @@
Gallery.cb.toggle(); Gallery.cb.toggle();
break; break;
case Conf['fappeTyme']: case Conf['fappeTyme']:
FappeTyme.cb.fappe(); FappeTyme.cb.toggle.call({
name: 'fappe'
});
break; break;
case Conf['werkTyme']: case Conf['werkTyme']:
FappeTyme.cb.werk(); FappeTyme.cb.toggle.call({
name: 'werk'
});
break; break;
case Conf['Front page']: case Conf['Front page']:
if (g.VIEW === 'index') { if (g.VIEW === 'index') {

View File

@ -230,6 +230,10 @@
MD5: '' MD5: ''
}, },
sauces: "https://www.google.com/searchbyimage?image_url=%TURL\nhttp://iqdb.org/?url=%TURL\n#//tineye.com/search?url=%TURL\n#http://saucenao.com/search.php?url=%TURL\n#http://3d.iqdb.org/?url=%TURL\n#http://regex.info/exif.cgi?imgurl=%URL\n# uploaders:\n#http://imgur.com/upload?url=%URL;text:Upload to imgur\n#http://ompldr.org/upload?url1=%URL;text:Upload to ompldr\n# \"View Same\" in archives:\n#//archive.foolz.us/_/search/image/%MD5/;text:View same on foolz\n#//archive.foolz.us/%board/search/image/%MD5/;text:View same on foolz /%board/\n#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/", sauces: "https://www.google.com/searchbyimage?image_url=%TURL\nhttp://iqdb.org/?url=%TURL\n#//tineye.com/search?url=%TURL\n#http://saucenao.com/search.php?url=%TURL\n#http://3d.iqdb.org/?url=%TURL\n#http://regex.info/exif.cgi?imgurl=%URL\n# uploaders:\n#http://imgur.com/upload?url=%URL;text:Upload to imgur\n#http://ompldr.org/upload?url1=%URL;text:Upload to ompldr\n# \"View Same\" in archives:\n#//archive.foolz.us/_/search/image/%MD5/;text:View same on foolz\n#//archive.foolz.us/%board/search/image/%MD5/;text:View same on foolz /%board/\n#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/",
FappeT: {
fappe: false,
werk: true
},
'sageEmoji': '4chan SS', 'sageEmoji': '4chan SS',
'emojiPos': 'before', 'emojiPos': 'before',
'Custom CSS': false, 'Custom CSS': false,
@ -7432,36 +7436,32 @@
FappeTyme = { FappeTyme = {
init: function() { init: function() {
var el, input; var el, input, lc, type, _i, _len, _ref;
if (!(Conf['Fappe Tyme'] || Conf['Werk Tyme']) || g.VIEW === 'catalog' || g.BOARD === 'f') { if (!(Conf['Fappe Tyme'] || Conf['Werk Tyme']) || g.VIEW === 'catalog' || g.BOARD === 'f') {
return; return;
} }
if (Conf['Fappe Tyme']) { _ref = ["Fappe", "Werk"];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
type = _ref[_i];
if (!Conf["" + type + " Tyme"]) {
continue;
}
lc = type.toLowerCase();
el = $.el('label', { el = $.el('label', {
innerHTML: "<input type=checkbox name=fappe-tyme> Fappe Tyme", innerHTML: "<input type=checkbox name=" + lc + "> " + type + " Tyme",
title: 'Fappe Tyme' title: "" + type + " Tyme"
}); });
FappeTyme.fappe = input = el.firstElementChild; FappeTyme[lc] = input = el.firstElementChild;
$.on(input, 'change', FappeTyme.cb.fappe); $.on(input, 'change', FappeTyme.cb.toggle.bind(input));
$.event('AddMenuEntry', { $.event('AddMenuEntry', {
type: 'header', type: 'header',
el: el, el: el,
order: 97 order: 97
}); });
} if (Conf[lc]) {
if (Conf['Werk Tyme']) { FappeTyme.cb.set(type);
el = $.el('label', { }
innerHTML: "<input type=checkbox name=werk-tyme> Werk Tyme",
title: 'Werk Tyme'
});
FappeTyme.werk = input = el.firstElementChild;
$.on(input, 'change', FappeTyme.cb.werk);
$.event('AddMenuEntry', {
type: 'header',
el: el,
order: 98
});
} }
return Post.callbacks.push({ return Post.callbacks.push({
name: 'Fappe Tyme', name: 'Fappe Tyme',
@ -7475,13 +7475,14 @@
return $.addClass(this.nodes.root, "noFile"); return $.addClass(this.nodes.root, "noFile");
}, },
cb: { cb: {
fappe: function() { set: function(type) {
$.toggleClass(doc, 'fappeTyme'); FappeTyme[type].checked = Conf[type];
return FappeTyme.fappe.checked = $.hasClass(doc, 'fappeTyme'); return $["" + (Conf[type] ? 'add' : 'rm') + "Class"](doc, "" + type + "Tyme");
}, },
werk: function() { toggle: function() {
$.toggleClass(doc, 'werkTyme'); Conf[this.name] = !Conf[this.name];
return FappeTyme.werk.checked = $.hasClass(doc, 'werkTyme'); FappeTyme.cb.set(this.name);
return $.cb.checked.call(FappeTyme[this.name]);
} }
} }
}; };
@ -11268,10 +11269,14 @@
Gallery.cb.toggle(); Gallery.cb.toggle();
break; break;
case Conf['fappeTyme']: case Conf['fappeTyme']:
FappeTyme.cb.fappe(); FappeTyme.cb.toggle.call({
name: 'fappe'
});
break; break;
case Conf['werkTyme']: case Conf['werkTyme']:
FappeTyme.cb.werk(); FappeTyme.cb.toggle.call({
name: 'werk'
});
break; break;
case Conf['Front page']: case Conf['Front page']:
if (g.VIEW === 'index') { if (g.VIEW === 'index') {

View File

@ -494,6 +494,10 @@ http://iqdb.org/?url=%TURL
#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/ #//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/
""" """
FappeT:
fappe: false
werk: true
'sageEmoji': '4chan SS' 'sageEmoji': '4chan SS'
'emojiPos': 'before' 'emojiPos': 'before'

View File

@ -2,33 +2,21 @@ FappeTyme =
init: -> init: ->
return if !(Conf['Fappe Tyme'] or Conf['Werk Tyme']) or g.VIEW is 'catalog' or g.BOARD is 'f' return if !(Conf['Fappe Tyme'] or Conf['Werk Tyme']) or g.VIEW is 'catalog' or g.BOARD is 'f'
if Conf['Fappe Tyme'] for type in ["Fappe", "Werk"] when Conf["#{type} Tyme"]
lc = type.toLowerCase()
el = $.el 'label', el = $.el 'label',
innerHTML: "<input type=checkbox name=fappe-tyme> Fappe Tyme" innerHTML: "<input type=checkbox name=#{lc}> #{type} Tyme"
title: 'Fappe Tyme' title: "#{type} Tyme"
FappeTyme.fappe = input = el.firstElementChild FappeTyme[lc] = input = el.firstElementChild
$.on input, 'change', FappeTyme.cb.toggle.bind input
$.on input, 'change', FappeTyme.cb.fappe
$.event 'AddMenuEntry', $.event 'AddMenuEntry',
type: 'header' type: 'header'
el: el el: el
order: 97 order: 97
if Conf['Werk Tyme'] FappeTyme.cb.set type if Conf[lc]
el = $.el 'label',
innerHTML: "<input type=checkbox name=werk-tyme> Werk Tyme"
title: 'Werk Tyme'
FappeTyme.werk = input = el.firstElementChild
$.on input, 'change', FappeTyme.cb.werk
$.event 'AddMenuEntry',
type: 'header'
el: el
order: 98
Post.callbacks.push Post.callbacks.push
name: 'Fappe Tyme' name: 'Fappe Tyme'
@ -39,9 +27,11 @@ FappeTyme =
$.addClass @nodes.root, "noFile" $.addClass @nodes.root, "noFile"
cb: cb:
fappe: -> set: (type) ->
$.toggleClass doc, 'fappeTyme' FappeTyme[type].checked = Conf[type]
FappeTyme.fappe.checked = $.hasClass doc, 'fappeTyme' $["#{if Conf[type] then 'add' else 'rm'}Class"] doc, "#{type}Tyme"
werk: ->
$.toggleClass doc, 'werkTyme' toggle: ->
FappeTyme.werk.checked = $.hasClass doc, 'werkTyme' Conf[@name] = !Conf[@name]
FappeTyme.cb.set @name
$.cb.checked.call FappeTyme[@name]

View File

@ -81,9 +81,9 @@ Keybinds =
when Conf['Open Gallery'] when Conf['Open Gallery']
Gallery.cb.toggle() Gallery.cb.toggle()
when Conf['fappeTyme'] when Conf['fappeTyme']
FappeTyme.cb.fappe() FappeTyme.cb.toggle.call {name: 'fappe'}
when Conf['werkTyme'] when Conf['werkTyme']
FappeTyme.cb.werk() FappeTyme.cb.toggle.call {name: 'werk'}
# Board Navigation # Board Navigation
when Conf['Front page'] when Conf['Front page']
if g.VIEW is 'index' if g.VIEW is 'index'