diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 75fcd53ae..62cc33461 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -4825,12 +4825,14 @@ this.pagelist = $.el('div', { className: 'pagelist', hidden: true - }, { + }); + $.extend(this.pagelist, { innerHTML: "
\r\r<\r\r
\r
\r
\r\r>\r\r
" }); this.navLinks = $.el('div', { className: 'navLinks' - }, { + }); + $.extend(this.navLinks, { innerHTML: "\r\r\\uf05c\r \r\r\r\r\r\r\r\r" }); this.timeEl = $('time#index-last-refresh', this.navLinks); @@ -6157,7 +6159,8 @@ comment = thread.OP.nodes.comment.innerHTML.replace(/(
\s*){2,}/g, '
'); root = $.el('div', { className: 'catalog-thread' - }, { + }); + $.extend(root, { innerHTML: "\r
\r" + postCount + " / " + fileCount + " / " + pageCount + "\r\r
\r" + subject + "\r
" + comment + "
\r" }); root.dataset.fullID = thread.fullID; @@ -9021,10 +9024,11 @@ dialog: function() { var dialog, elm, event, i, items, match_max, match_min, name, node, nodes, rules, save, setNode; QR.nodes = nodes = { - el: dialog = UI.dialog('qr', 'top:0;right:0;', { - innerHTML: "
\r\r
\r\r
\r\\uf00d\r
\r
\r
\r\r\r \r
\r
\r\r\r
\r
\r
\r+\r
\r
\r\rNo selected file\r\r\r\rSpoiler\r\\uf0c1\rPost from URL\r+\rDump\r\\uf00d\rRemove File\r\r\r\r
\r\r
\r\r\r\r" - }) + el: dialog = UI.dialog('qr', 'top:0;right:0;') }; + $.extend(dialog, { + innerHTML: "
\r\r
\r\r
\r\\uf00d\r
\r
\r
\r\r\r \r
\r
\r\r\r
\r
\r
\r+\r
\r
\r\rNo selected file\r\r\r\rSpoiler\r\\uf0c1\rPost from URL\r+\rDump\r\\uf00d\rRemove File\r\r\r\r
\r\r
\r\r\r\r" + }); setNode = function(name, query) { return nodes[name] = $(query, dialog); }; @@ -17065,7 +17069,8 @@ Settings.dialog = dialog = $.el('div', { id: 'appchanx-settings', "class": 'dialog' - }, { + }); + $.extend(dialog, { innerHTML: "\r
\r
\r" }); Settings.overlay = overlay = $.el('div', { diff --git a/builds/crx/script.js b/builds/crx/script.js index 23eb4321d..d6918b575 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -4854,12 +4854,14 @@ this.pagelist = $.el('div', { className: 'pagelist', hidden: true - }, { + }); + $.extend(this.pagelist, { innerHTML: "
\r\r<\r\r
\r
\r
\r\r>\r\r
" }); this.navLinks = $.el('div', { className: 'navLinks' - }, { + }); + $.extend(this.navLinks, { innerHTML: "\r\r\\uf05c\r \r\r\r\r\r\r\r\r" }); this.timeEl = $('time#index-last-refresh', this.navLinks); @@ -6186,7 +6188,8 @@ comment = thread.OP.nodes.comment.innerHTML.replace(/(
\s*){2,}/g, '
'); root = $.el('div', { className: 'catalog-thread' - }, { + }); + $.extend(root, { innerHTML: "\r
\r" + postCount + " / " + fileCount + " / " + pageCount + "\r\r
\r" + subject + "\r
" + comment + "
\r" }); root.dataset.fullID = thread.fullID; @@ -9076,10 +9079,11 @@ dialog: function() { var dialog, elm, event, i, items, match_max, match_min, name, node, nodes, rules, save, setNode; QR.nodes = nodes = { - el: dialog = UI.dialog('qr', 'top:0;right:0;', { - innerHTML: "
\r\r
\r\r
\r\\uf00d\r
\r
\r
\r\r\r \r
\r
\r\r\r
\r
\r
\r+\r
\r
\r\rNo selected file\r\r\r\rSpoiler\r\\uf0c1\rPost from URL\r+\rDump\r\\uf00d\rRemove File\r\r\r\r
\r\r
\r\r\r\r" - }) + el: dialog = UI.dialog('qr', 'top:0;right:0;') }; + $.extend(dialog, { + innerHTML: "
\r\r
\r\r
\r\\uf00d\r
\r
\r
\r\r\r \r
\r
\r\r\r
\r
\r
\r+\r
\r
\r\rNo selected file\r\r\r\rSpoiler\r\\uf0c1\rPost from URL\r+\rDump\r\\uf00d\rRemove File\r\r\r\r
\r\r
\r\r\r\r" + }); setNode = function(name, query) { return nodes[name] = $(query, dialog); }; @@ -17088,7 +17092,8 @@ Settings.dialog = dialog = $.el('div', { id: 'appchanx-settings', "class": 'dialog' - }, { + }); + $.extend(dialog, { innerHTML: "\r
\r
\r" }); Settings.overlay = overlay = $.el('div', { diff --git a/src/General/Build.coffee b/src/General/Build.coffee index 2db22c451..839d8ef28 100755 --- a/src/General/Build.coffee +++ b/src/General/Build.coffee @@ -318,8 +318,9 @@ Build = comment = thread.OP.nodes.comment.innerHTML.replace /(
\s*){2,}/g, '
' root = $.el 'div', - className: 'catalog-thread' - <%= importHTML('Features/Thread-catalog-view') %> + className: 'catalog-thread', + + $.extend root, <%= importHTML('Features/Thread-catalog-view') %> root.dataset.fullID = thread.fullID $.addClass root, 'pinned' if thread.isPinned diff --git a/src/General/Index.coffee b/src/General/Index.coffee index 9a255aa00..39e75880d 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -84,12 +84,13 @@ Index = @root = $.el 'div', className: 'board' @pagelist = $.el 'div', className: 'pagelist' - hidden: true - <%= importHTML('Features/Index-pagelist') %> + hidden: true, + $.extend @pagelist, <%= importHTML('Features/Index-pagelist') %> @navLinks = $.el 'div', - className: 'navLinks' - <%= importHTML('Features/Index-navlinks') %> + className: 'navLinks', + $.extend @navLinks, <%= importHTML('Features/Index-navlinks') %> + @timeEl = $ 'time#index-last-refresh', @navLinks @searchInput = $ '#index-search', @navLinks diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index c4f19550e..246580c82 100755 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -53,7 +53,7 @@ Settings = Settings.dialog = dialog = $.el 'div', id: 'appchanx-settings' class: 'dialog' - <%= importHTML('Settings/Settings') %> + $.extend dialog, <%= importHTML('Settings/Settings') %> Settings.overlay = overlay = $.el 'div', id: 'overlay' @@ -63,7 +63,6 @@ Settings = $.on $('.reset', dialog), 'click', Settings.reset $.on $('input', dialog), 'change', Settings.onImport - links = [] for section in Settings.sections link = $.el 'a', diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index 3754c6bf3..2babc361c 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -359,7 +359,8 @@ QR = dialog: -> QR.nodes = nodes = - el: dialog = UI.dialog 'qr', 'top:0;right:0;', <%= importHTML('Features/QuickReply') %> + el: dialog = UI.dialog 'qr', 'top:0;right:0;', + $.extend dialog, <%= importHTML('Features/QuickReply') %> setNode = (name, query) -> nodes[name] = $ query, dialog