From 9c65bd1808e758bc38d7d85a221f7d67d1f47f29 Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Mon, 27 May 2013 18:01:43 -0700 Subject: [PATCH] Silly me. --- builds/appchan-x.js | 27 +++++++++++---------------- builds/appchan-x.user.js | 27 +++++++++++---------------- builds/crx/script.js | 27 +++++++++++---------------- src/Theming/Style.coffee | 27 +++++++++++---------------- 4 files changed, 44 insertions(+), 64 deletions(-) diff --git a/builds/appchan-x.js b/builds/appchan-x.js index 8b49883bd..8a937f979 100644 --- a/builds/appchan-x.js +++ b/builds/appchan-x.js @@ -11324,7 +11324,6 @@ asapInit: function() { $.addClass(doc, 'presto'); $.addClass(doc, 'appchan-x'); - $.addClass(doc, g.VIEW); MascotTools.init(); if (g.VIEW === 'index') { return $.asap((function() { @@ -11379,7 +11378,17 @@ agent: "-o-", sizing: "box-sizing", setup: function() { - this.addStyleReady(); + var theme; + + theme = Themes[Conf['theme']]; + $.extend(Style, { + layoutCSS: $.addStyle(Style.layout(), 'layout'), + themeCSS: $.addStyle(Style.theme(theme), 'theme'), + icons: $.addStyle("", 'icons'), + paddingSheet: $.addStyle("", 'padding'), + mascot: $.addStyle("", 'mascotSheet') + }); + $.addStyle(JSColor.css(), 'jsColor'); if (d.head) { this.remStyle(); if (!Style.headCount) { @@ -11435,20 +11444,6 @@ return Style.padding(); }, headCount: 12, - addStyleReady: function() { - var theme; - - theme = Themes[Conf['theme']]; - $.extend(Style, { - layoutCSS: $.addStyle(Style.layout(), 'layout'), - themeCSS: $.addStyle(Style.theme(theme), 'theme'), - icons: $.addStyle("", 'icons'), - paddingSheet: $.addStyle("", 'padding'), - mascot: $.addStyle("", 'mascotSheet') - }); - $.addStyle(JSColor.css(), 'jsColor'); - return delete Style.addStyleReady; - }, remStyle: function() { var i, node, nodes; diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 33cdf515f..33ab4c336 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -11318,7 +11318,6 @@ asapInit: function() { $.addClass(doc, 'gecko'); $.addClass(doc, 'appchan-x'); - $.addClass(doc, g.VIEW); MascotTools.init(); if (g.VIEW === 'index') { return $.asap((function() { @@ -11373,7 +11372,17 @@ agent: "-moz-", sizing: "-moz-box-sizing", setup: function() { - this.addStyleReady(); + var theme; + + theme = Themes[Conf['theme']]; + $.extend(Style, { + layoutCSS: $.addStyle(Style.layout(), 'layout'), + themeCSS: $.addStyle(Style.theme(theme), 'theme'), + icons: $.addStyle("", 'icons'), + paddingSheet: $.addStyle("", 'padding'), + mascot: $.addStyle("", 'mascotSheet') + }); + $.addStyle(JSColor.css(), 'jsColor'); if (d.head) { this.remStyle(); if (!Style.headCount) { @@ -11429,20 +11438,6 @@ return Style.padding(); }, headCount: 12, - addStyleReady: function() { - var theme; - - theme = Themes[Conf['theme']]; - $.extend(Style, { - layoutCSS: $.addStyle(Style.layout(), 'layout'), - themeCSS: $.addStyle(Style.theme(theme), 'theme'), - icons: $.addStyle("", 'icons'), - paddingSheet: $.addStyle("", 'padding'), - mascot: $.addStyle("", 'mascotSheet') - }); - $.addStyle(JSColor.css(), 'jsColor'); - return delete Style.addStyleReady; - }, remStyle: function() { var i, node, nodes; diff --git a/builds/crx/script.js b/builds/crx/script.js index 112f3a329..1adea3f88 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -11301,7 +11301,6 @@ $.addClass(doc, 'webkit'); $.addClass(doc, 'blink'); $.addClass(doc, 'appchan-x'); - $.addClass(doc, g.VIEW); MascotTools.init(); if (g.VIEW === 'index') { return $.asap((function() { @@ -11356,7 +11355,17 @@ agent: "-webkit-", sizing: "box-sizing", setup: function() { - this.addStyleReady(); + var theme; + + theme = Themes[Conf['theme']]; + $.extend(Style, { + layoutCSS: $.addStyle(Style.layout(), 'layout'), + themeCSS: $.addStyle(Style.theme(theme), 'theme'), + icons: $.addStyle("", 'icons'), + paddingSheet: $.addStyle("", 'padding'), + mascot: $.addStyle("", 'mascotSheet') + }); + $.addStyle(JSColor.css(), 'jsColor'); if (d.head) { this.remStyle(); if (!Style.headCount) { @@ -11412,20 +11421,6 @@ return Style.padding(); }, headCount: 12, - addStyleReady: function() { - var theme; - - theme = Themes[Conf['theme']]; - $.extend(Style, { - layoutCSS: $.addStyle(Style.layout(), 'layout'), - themeCSS: $.addStyle(Style.theme(theme), 'theme'), - icons: $.addStyle("", 'icons'), - paddingSheet: $.addStyle("", 'padding'), - mascot: $.addStyle("", 'mascotSheet') - }); - $.addStyle(JSColor.css(), 'jsColor'); - return delete Style.addStyleReady; - }, remStyle: function() { var i, node, nodes; diff --git a/src/Theming/Style.coffee b/src/Theming/Style.coffee index 596914d5f..b1713252e 100644 --- a/src/Theming/Style.coffee +++ b/src/Theming/Style.coffee @@ -14,7 +14,6 @@ Style = $.addClass doc, 'gecko' <% } %> $.addClass doc, 'appchan-x' - $.addClass doc, g.VIEW MascotTools.init() @@ -62,7 +61,17 @@ Style = sizing: "<% if (type === 'userscript') { %>-moz-<% } else { %><% } %>box-sizing" setup: -> - @addStyleReady() + theme = Themes[Conf['theme']] + $.extend Style, + layoutCSS: $.addStyle Style.layout(), 'layout' + themeCSS: $.addStyle Style.theme(theme), 'theme' + icons: $.addStyle "", 'icons' + paddingSheet: $.addStyle "", 'padding' + mascot: $.addStyle "", 'mascotSheet' + + # Non-customizable + $.addStyle JSColor.css(), 'jsColor' + if d.head @remStyle() unless Style.headCount @@ -109,20 +118,6 @@ Style = headCount: 12 - addStyleReady: -> - theme = Themes[Conf['theme']] - $.extend Style, - layoutCSS: $.addStyle Style.layout(), 'layout' - themeCSS: $.addStyle Style.theme(theme), 'theme' - icons: $.addStyle "", 'icons' - paddingSheet: $.addStyle "", 'padding' - mascot: $.addStyle "", 'mascotSheet' - - # Non-customizable - $.addStyle JSColor.css(), 'jsColor' - - delete Style.addStyleReady - remStyle: -> nodes = d.head.children i = nodes.length