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

Fix theme saving.

Browse Source
This commit is contained in:
Zixaphir 2014-01-13 18:22:39 -07:00
parent 9ecbcd1455
commit 1203260f21
7 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builds/appchan-x.user.js
View File

@ -13062,7 +13062,7 @@
});
ctx = el.getContext('2d');
ctx.font = "40px " + Conf['Font'];
ctx.fillStyle = (new Color((Themes[Conf['theme']] || Themes['Yotsuba B'])['Text'])).hex();
ctx.fillStyle = (new Color((Themes[Conf[g.THEMESTRING]] || Themes[g.TYPE === 'sfw' ? 'Yotsuba B' : 'Yotsuba'])['Text'])).hex();
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.fillText("Mascot 404", 124, 50);
@ -13484,7 +13484,7 @@
init: function() {
var i, item, items, theme;
Style.svgs = {};
theme = Themes[Conf['theme']] || Themes['Yotsuba B'];
theme = Themes[Conf[g.THEMESTRING]] || Themes['Yotsuba B'];
items = [['layout', Style.layout], ['theme', Style.theme(theme)], ['emoji', Emoji.css()], ['dynamic', Style.dynamic()], ['padding', ""], ['mascots', ""]];
i = 0;
while (item = items[i++]) {
@ -15794,7 +15794,7 @@
}
if (Conf["NSFW/SFW Themes"]) {
Main.setThemeString();
theme = Themes[Conf[g.STYLESTRING] || (sfw ? 'Yotsuba B' : 'Yotsuba')] || Themes[Conf[g.STYLESTRING] = sfw ? 'Yotsuba B' : 'Yotsuba'];
theme = Themes[Conf[g.THEMESTRING] || (sfw ? 'Yotsuba B' : 'Yotsuba')] || Themes[Conf[g.THEMESTRING] = sfw ? 'Yotsuba B' : 'Yotsuba'];
Style.setTheme(theme);
}
Favicon.SFW = sfw;
@ -16657,7 +16657,7 @@
continue;
}
div = $.el('div', {
className: "theme " + (name === Conf['theme'] ? 'selectedtheme' : ''),
className: "theme " + (name === Conf[g.THEMESTRING] ? 'selectedtheme' : ''),
id: name,
innerHTML: "<div style='cursor: pointer; position: relative; margin-bottom: 2px; width: 100% ; box-shadow: none ; background:" + theme['Reply Background'] + ";border:1px solid " + theme['Reply Border'] + ";color:" + theme['Text'] + "'><div><div style='cursor: pointer; width: 9px; height: 9px; margin: 2px 3px; display: inline-block; vertical-align: bottom; background: " + theme['Checkbox Background'] + "; border: 1px solid " + theme['Checkbox Border'] + ";'></div><span style='color:" + theme['Subjects'] + "; font-weight: 600 '>\n " + name + "\n </span><span style='color:" + theme['Names'] + "; font-weight: 600 '>\n " + theme['Author'] + "\n </span><span style='color:" + theme['Sage'] + "'>\n (SAGE)\n </span><span style='color:" + theme['Tripcodes'] + "'>\n " + theme['Author Tripcode'] + "\n </span><time style='color:" + theme['Timestamps'] + "'>\n 20XX.01.01 12:00\n </time><a data-color='" + theme['Post Numbers'] + "' data-hover='" + theme['Hovered Links'] + "'>\n No.27583594\n </a><a data-color='" + theme['Backlinks'] + "' data-hover='" + theme['Hovered Links'] + "' name='" + name + "' class=edit>\n &gt;&gt;edit\n </a><a data-color='" + theme['Backlinks'] + "' data-hover='" + theme['Hovered Links'] + "' name='" + name + "' class=export>\n &gt;&gt;export\n </a><a data-color='" + theme['Backlinks'] + "' data-hover='" + theme['Hovered Links'] + "' name='" + name + "' class=delete>\n &gt;&gt;delete\n </a></div><blockquote style='margin: 0; padding: 12px 40px 12px 38px'><a data-color='" + theme['Quotelinks'] + "' data-hover='" + theme['Hovered Links'] + "' style='text-shadow: none;'>\n &gt;&gt;27582902\n </a><br>\n Post content is right here.\n</blockquote><h1 style='color: " + theme['Text'] + "'>\n Selected\n</h1></div>"
});
@ -17026,10 +17026,10 @@
theme: {
select: function() {
var current;
if (current = $.id(Conf[g.STYLESTRING])) {
if (current = $.id(Conf[g.THEMESTRING])) {
$.rmClass(current, 'selectedtheme');
}
$.set(g.STYLESTRING, Conf[g.STYLESTRING] = this.id);
$.set(g.THEMESTRING, Conf[g.THEMESTRING] = this.id);
$.addClass(this, 'selectedtheme');
return Style.setTheme(Themes[this.id]);
},
@ -17067,11 +17067,11 @@
return;
}
if (confirm("Are you sure you want to delete \"" + this.name + "\"?")) {
if (this.name === Conf['theme']) {
if (this.name === Conf[g.THEMESTRING]) {
if (settheme = container.previousSibling || container.nextSibling) {
Conf['theme'] = settheme.id;
Conf[g.THEMESTRING] = settheme.id;
$.addClass(settheme, 'selectedtheme');
$.set('theme', Conf['theme']);
$.set(g.THEMESTRING, Conf[g.THEMESTRING]);
}
}
Themes[this.name]["Deleted"] = true;
@ -17412,7 +17412,7 @@
if (Conf["NSFW/SFW Themes"]) {
type += "_" + g.TYPE;
}
return g.STYLESTRING = type;
return g.THEMESTRING = type;
}
};

20
builds/crx/script.js
View File

@ -13051,7 +13051,7 @@
});
ctx = el.getContext('2d');
ctx.font = "40px " + Conf['Font'];
ctx.fillStyle = (new Color((Themes[Conf['theme']] || Themes['Yotsuba B'])['Text'])).hex();
ctx.fillStyle = (new Color((Themes[Conf[g.THEMESTRING]] || Themes[g.TYPE === 'sfw' ? 'Yotsuba B' : 'Yotsuba'])['Text'])).hex();
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.fillText("Mascot 404", 124, 50);
@ -13477,7 +13477,7 @@
id: 'svg_filters'
})
};
theme = Themes[Conf['theme']] || Themes['Yotsuba B'];
theme = Themes[Conf[g.THEMESTRING]] || Themes['Yotsuba B'];
items = [['layout', Style.layout], ['theme', Style.theme(theme)], ['emoji', Emoji.css()], ['dynamic', Style.dynamic()], ['padding', ""], ['mascots', ""]];
i = 0;
while (item = items[i++]) {
@ -15789,7 +15789,7 @@
}
if (Conf["NSFW/SFW Themes"]) {
Main.setThemeString();
theme = Themes[Conf[g.STYLESTRING] || (sfw ? 'Yotsuba B' : 'Yotsuba')] || Themes[Conf[g.STYLESTRING] = sfw ? 'Yotsuba B' : 'Yotsuba'];
theme = Themes[Conf[g.THEMESTRING] || (sfw ? 'Yotsuba B' : 'Yotsuba')] || Themes[Conf[g.THEMESTRING] = sfw ? 'Yotsuba B' : 'Yotsuba'];
Style.setTheme(theme);
}
Favicon.SFW = sfw;
@ -16650,7 +16650,7 @@
continue;
}
div = $.el('div', {
className: "theme " + (name === Conf['theme'] ? 'selectedtheme' : ''),
className: "theme " + (name === Conf[g.THEMESTRING] ? 'selectedtheme' : ''),
id: name,
innerHTML: "<div style='cursor: pointer; position: relative; margin-bottom: 2px; width: 100% ; box-shadow: none ; background:" + theme['Reply Background'] + ";border:1px solid " + theme['Reply Border'] + ";color:" + theme['Text'] + "'><div><div style='cursor: pointer; width: 9px; height: 9px; margin: 2px 3px; display: inline-block; vertical-align: bottom; background: " + theme['Checkbox Background'] + "; border: 1px solid " + theme['Checkbox Border'] + ";'></div><span style='color:" + theme['Subjects'] + "; font-weight: 600 '>\n " + name + "\n </span><span style='color:" + theme['Names'] + "; font-weight: 600 '>\n " + theme['Author'] + "\n </span><span style='color:" + theme['Sage'] + "'>\n (SAGE)\n </span><span style='color:" + theme['Tripcodes'] + "'>\n " + theme['Author Tripcode'] + "\n </span><time style='color:" + theme['Timestamps'] + "'>\n 20XX.01.01 12:00\n </time><a data-color='" + theme['Post Numbers'] + "' data-hover='" + theme['Hovered Links'] + "'>\n No.27583594\n </a><a data-color='" + theme['Backlinks'] + "' data-hover='" + theme['Hovered Links'] + "' name='" + name + "' class=edit>\n &gt;&gt;edit\n </a><a data-color='" + theme['Backlinks'] + "' data-hover='" + theme['Hovered Links'] + "' name='" + name + "' class=export>\n &gt;&gt;export\n </a><a data-color='" + theme['Backlinks'] + "' data-hover='" + theme['Hovered Links'] + "' name='" + name + "' class=delete>\n &gt;&gt;delete\n </a></div><blockquote style='margin: 0; padding: 12px 40px 12px 38px'><a data-color='" + theme['Quotelinks'] + "' data-hover='" + theme['Hovered Links'] + "' style='text-shadow: none;'>\n &gt;&gt;27582902\n </a><br>\n Post content is right here.\n</blockquote><h1 style='color: " + theme['Text'] + "'>\n Selected\n</h1></div>"
});
@ -17016,10 +17016,10 @@
theme: {
select: function() {
var current;
if (current = $.id(Conf[g.STYLESTRING])) {
if (current = $.id(Conf[g.THEMESTRING])) {
$.rmClass(current, 'selectedtheme');
}
$.set(g.STYLESTRING, Conf[g.STYLESTRING] = this.id);
$.set(g.THEMESTRING, Conf[g.THEMESTRING] = this.id);
$.addClass(this, 'selectedtheme');
return Style.setTheme(Themes[this.id]);
},
@ -17054,11 +17054,11 @@
return;
}
if (confirm("Are you sure you want to delete \"" + this.name + "\"?")) {
if (this.name === Conf['theme']) {
if (this.name === Conf[g.THEMESTRING]) {
if (settheme = container.previousSibling || container.nextSibling) {
Conf['theme'] = settheme.id;
Conf[g.THEMESTRING] = settheme.id;
$.addClass(settheme, 'selectedtheme');
$.set('theme', Conf['theme']);
$.set(g.THEMESTRING, Conf[g.THEMESTRING]);
}
}
Themes[this.name]["Deleted"] = true;
@ -17389,7 +17389,7 @@
if (Conf["NSFW/SFW Themes"]) {
type += "_" + g.TYPE;
}
return g.STYLESTRING = type;
return g.THEMESTRING = type;
}
};

2
src/General/Main.coffee
View File

@ -316,6 +316,6 @@ Main =
type = "theme"
if Conf["NSFW/SFW Themes"]
type += "_#{g.TYPE}"
g.STYLESTRING = type
g.THEMESTRING = type
Main.init()

2
src/General/Navigate.coffee
View File

@ -140,7 +140,7 @@ Navigate =
if Conf["NSFW/SFW Themes"]
Main.setThemeString()
theme = Themes[Conf[g.STYLESTRING] or if sfw then 'Yotsuba B' else 'Yotsuba'] or Themes[Conf[g.STYLESTRING] = if sfw then 'Yotsuba B' else 'Yotsuba']
theme = Themes[Conf[g.THEMESTRING] or if sfw then 'Yotsuba B' else 'Yotsuba'] or Themes[Conf[g.THEMESTRING] = if sfw then 'Yotsuba B' else 'Yotsuba']
Style.setTheme theme
Favicon.SFW = sfw

12
src/General/Settings.coffee
View File

@ -549,7 +549,7 @@ Settings =
continue if theme["Deleted"]
div = $.el 'div',
className: "theme #{if name is Conf['theme'] then 'selectedtheme' else ''}"
className: "theme #{if name is Conf[g.THEMESTRING] then 'selectedtheme' else ''}"
id: name
innerHTML: """<%= grunt.file.read('src/General/html/Settings/Theme.html').replace(/>\s+</g, '><').trim() %>"""
@ -880,10 +880,10 @@ Settings =
theme:
select: ->
if current = $.id(Conf[g.STYLESTRING])
if current = $.id(Conf[g.THEMESTRING])
$.rmClass current, 'selectedtheme'
$.set g.STYLESTRING, Conf[g.STYLESTRING] = @id
$.set g.THEMESTRING, Conf[g.THEMESTRING] = @id
$.addClass @, 'selectedtheme'
Style.setTheme Themes[@id]
@ -923,11 +923,11 @@ Settings =
return
if confirm "Are you sure you want to delete \"#{@name}\"?"
if @name is Conf['theme']
if @name is Conf[g.THEMESTRING]
if settheme = container.previousSibling or container.nextSibling
Conf['theme'] = settheme.id
Conf[g.THEMESTRING] = settheme.id
$.addClass settheme, 'selectedtheme'
$.set 'theme', Conf['theme']
$.set g.THEMESTRING, Conf[g.THEMESTRING]
Themes[@name]["Deleted"] = true
$.get "userThemes", {}, ({userThemes}) =>

2
src/Theming/Mascots.coffee
View File

@ -52,7 +52,7 @@ MascotTools =
height: 100
ctx = el.getContext('2d')
ctx.font = "40px #{Conf['Font']}"
ctx.fillStyle = (new Color (Themes[Conf['theme']] or Themes['Yotsuba B'])['Text']).hex()
ctx.fillStyle = (new Color (Themes[Conf[g.THEMESTRING]] or Themes[if g.TYPE is 'sfw' then 'Yotsuba B' else 'Yotsuba'])['Text']).hex()
ctx.textAlign = 'center'
ctx.textBaseline = 'middle'
ctx.fillText "Mascot 404", 124, 50

2
src/Theming/Style.coffee
View File

@ -8,7 +8,7 @@ Style =
<% } %>
}
theme = Themes[Conf['theme']] or Themes['Yotsuba B']
theme = Themes[Conf[g.THEMESTRING]] or Themes['Yotsuba B']
items = [
['layout', Style.layout]
['theme', Style.theme theme]