Some former Samachan users are regrouping on SushiChan.
(a message from 4chan X)') %> + {innerHTML: "Looking for a new home?
Some former Samachan users are regrouping on SushiChan.
(a message from 4chan X)"} Main.ready -> new Notice 'info', el Conf['PSAseen'].push('samachan') diff --git a/src/Miscellaneous/PassMessage.coffee b/src/Miscellaneous/PassMessage.coffee index 8426e23e8..64299e98c 100644 --- a/src/Miscellaneous/PassMessage.coffee +++ b/src/Miscellaneous/PassMessage.coffee @@ -1,10 +1,12 @@ +import PassMessagePage from './PassMessage/PassMessage.html'; + PassMessage = init: -> return if Conf['passMessageClosed'] msg = $.el 'div', className: 'box-outer top-box' , - `<%= readHTML('PassMessage.html') %>` + `{ innerHTML: PassMessagePage }` msg.style.cssText = 'padding-bottom: 0;' close = $ 'a', msg $.on close, 'click', -> diff --git a/src/Miscellaneous/PostJumper.coffee b/src/Miscellaneous/PostJumper.coffee index df61b4be9..97c97d5c7 100644 --- a/src/Miscellaneous/PostJumper.coffee +++ b/src/Miscellaneous/PostJumper.coffee @@ -56,7 +56,7 @@ PostJumper = classNext = 'next' span = $.el 'span', className: 'postJumper' - $.extend span, `<%= html('${charPrev}${charNext}') %>` + $.extend span, `{innerHTML: "" + E(charPrev) + "" + E(charNext) + ""}` span scroll: (fromJumper, toJumper) -> diff --git a/src/Miscellaneous/Report.coffee b/src/Miscellaneous/Report.coffee index c0ca047d2..0ed1c7161 100644 --- a/src/Miscellaneous/Report.coffee +++ b/src/Miscellaneous/Report.coffee @@ -1,3 +1,5 @@ +import ReportPage from './ArchiveReport.html'; + Report = init: -> return if not (match = location.search.match /\bno=(\d+)/) @@ -35,7 +37,7 @@ Report = id: 'archive-report' hidden: true , - `<%= readHTML('ArchiveReport.html') %>` + `{ innerHTML: ReportPage }` enabled = $ '#archive-report-enabled', fieldset reason = $ '#archive-report-reason', fieldset submit = $ '#archive-report-submit', fieldset diff --git a/src/Monitoring/Favicon.coffee b/src/Monitoring/Favicon.coffee index be88d2599..2b5e97605 100644 --- a/src/Monitoring/Favicon.coffee +++ b/src/Monitoring/Favicon.coffee @@ -1,3 +1,43 @@ +import ferongr_unreadDead from './Favicon/ferongr.unreadDead.png'; +import ferongr_unreadDeadY from './Favicon/ferongr.unreadDeadY.png'; +import ferongr_unreadSFW from './Favicon/ferongr.unreadSFW.png'; +import ferongr_unreadSFWY from './Favicon/ferongr.unreadSFWY.png'; +import ferongr_unreadNSFW from './Favicon/ferongr.unreadNSFW.png'; +import ferongr_unreadNSFWY from './Favicon/ferongr.unreadNSFWY.png'; +import xat_unreadDead from './Favicon/xat-.unreadDead.png'; +import xat_unreadDeadY from './Favicon/xat-.unreadDeadY.png'; +import xat_unreadSFW from './Favicon/xat-.unreadSFW.png'; +import xat_unreadSFWY from './Favicon/xat-.unreadSFWY.png'; +import xat_unreadNSFW from './Favicon/xat-.unreadNSFW.png'; +import xat_unreadNSFWY from './Favicon/xat-.unreadNSFWY.png'; +import Mayhem_unreadDead from './Favicon/Mayhem.unreadDead.png'; +import Mayhem_unreadDeadY from './Favicon/Mayhem.unreadDeadY.png'; +import Mayhem_unreadSFW from './Favicon/Mayhem.unreadSFW.png'; +import Mayhem_unreadSFWY from './Favicon/Mayhem.unreadSFWY.png'; +import Mayhem_unreadNSFW from './Favicon/Mayhem.unreadNSFW.png'; +import Mayhem_unreadNSFWY from './Favicon/Mayhem.unreadNSFWY.png'; +import 4chanJS_unreadDead from './Favicon/4chanJS.unreadDead.png'; +import 4chanJS_unreadDeadY from './Favicon/4chanJS.unreadDeadY.png'; +import 4chanJS_unreadSFW from './Favicon/4chanJS.unreadSFW.png'; +import 4chanJS_unreadSFWY from './Favicon/4chanJS.unreadSFWY.png'; +import 4chanJS_unreadNSFW from './Favicon/4chanJS.unreadNSFW.png'; +import 4chanJS_unreadNSFWY from './Favicon/4chanJS.unreadNSFWY.png'; +import Original_unreadDead from './Favicon/Original.unreadDead.png'; +import Original_unreadDeadY from './Favicon/Original.unreadDeadY.png'; +import Original_unreadSFW from './Favicon/Original.unreadSFW.png'; +import Original_unreadSFWY from './Favicon/Original.unreadSFWY.png'; +import Original_unreadNSFW from './Favicon/Original.unreadNSFW.png'; +import Original_unreadNSFWY from './Favicon/Original.unreadNSFWY.png'; +import Metro_unreadDead from './Favicon/Metro.unreadDead.png'; +import Metro_unreadDeadY from './Favicon/Metro.unreadDeadY.png'; +import Metro_unreadSFW from './Favicon/Metro.unreadSFW.png'; +import Metro_unreadSFWY from './Favicon/Metro.unreadSFWY.png'; +import Metro_unreadNSFW from './Favicon/Metro.unreadNSFW.png'; +import Metro_unreadNSFWY from './Favicon/Metro.unreadNSFWY.png'; +import dead from './Favicon/dead.gif'; +import empty from './Favicon/empty.gif'; + + Favicon = init: -> $.asap (-> d.head and (Favicon.el = $ 'link[rel="shortcut icon"]', d.head)), Favicon.initAsap @@ -21,52 +61,52 @@ Favicon = switch: -> items = { ferongr: [ - '<%= readBase64("ferongr.unreadDead.png") %>' - '<%= readBase64("ferongr.unreadDeadY.png") %>' - '<%= readBase64("ferongr.unreadSFW.png") %>' - '<%= readBase64("ferongr.unreadSFWY.png") %>' - '<%= readBase64("ferongr.unreadNSFW.png") %>' - '<%= readBase64("ferongr.unreadNSFWY.png") %>' + ferongr_unreadDead, + ferongr_unreadDeadY, + ferongr_unreadSFW, + ferongr_unreadSFWY, + ferongr_unreadNSFW, + ferongr_unreadNSFWY, ] 'xat-': [ - '<%= readBase64("xat-.unreadDead.png") %>' - '<%= readBase64("xat-.unreadDeadY.png") %>' - '<%= readBase64("xat-.unreadSFW.png") %>' - '<%= readBase64("xat-.unreadSFWY.png") %>' - '<%= readBase64("xat-.unreadNSFW.png") %>' - '<%= readBase64("xat-.unreadNSFWY.png") %>' + xat_unreadDead, + xat_unreadDeadY, + xat_unreadSFW, + xat_unreadSFWY, + xat_unreadNSFW, + xat_unreadNSFWY, ] Mayhem: [ - '<%= readBase64("Mayhem.unreadDead.png") %>' - '<%= readBase64("Mayhem.unreadDeadY.png") %>' - '<%= readBase64("Mayhem.unreadSFW.png") %>' - '<%= readBase64("Mayhem.unreadSFWY.png") %>' - '<%= readBase64("Mayhem.unreadNSFW.png") %>' - '<%= readBase64("Mayhem.unreadNSFWY.png") %>' + Mayhem_unreadDead, + Mayhem_unreadDeadY, + Mayhem_unreadSFW, + Mayhem_unreadSFWY, + Mayhem_unreadNSFW, + Mayhem_unreadNSFWY, ] '4chanJS': [ - '<%= readBase64("4chanJS.unreadDead.png") %>' - '<%= readBase64("4chanJS.unreadDeadY.png") %>' - '<%= readBase64("4chanJS.unreadSFW.png") %>' - '<%= readBase64("4chanJS.unreadSFWY.png") %>' - '<%= readBase64("4chanJS.unreadNSFW.png") %>' - '<%= readBase64("4chanJS.unreadNSFWY.png") %>' + 4chanJS_unreadDead, + 4chanJS_unreadDeadY, + 4chanJS_unreadSFW, + 4chanJS_unreadSFWY, + 4chanJS_unreadNSFW, + 4chanJS_unreadNSFWY, ] Original: [ - '<%= readBase64("Original.unreadDead.png") %>' - '<%= readBase64("Original.unreadDeadY.png") %>' - '<%= readBase64("Original.unreadSFW.png") %>' - '<%= readBase64("Original.unreadSFWY.png") %>' - '<%= readBase64("Original.unreadNSFW.png") %>' - '<%= readBase64("Original.unreadNSFWY.png") %>' + Original_unreadDead, + Original_unreadDeadY, + Original_unreadSFW, + Original_unreadSFWY, + Original_unreadNSFW, + Original_unreadNSFWY, ] 'Metro': [ - '<%= readBase64("Metro.unreadDead.png") %>' - '<%= readBase64("Metro.unreadDeadY.png") %>' - '<%= readBase64("Metro.unreadSFW.png") %>' - '<%= readBase64("Metro.unreadSFWY.png") %>' - '<%= readBase64("Metro.unreadNSFW.png") %>' - '<%= readBase64("Metro.unreadNSFWY.png") %>' + Metro_unreadDead, + Metro_unreadDeadY, + Metro_unreadSFW, + Metro_unreadSFWY, + Metro_unreadNSFW, + Metro_unreadNSFWY, ] } items = $.getOwn(items, Conf['favicon']) @@ -90,5 +130,6 @@ Favicon = SFW: '//s.4cdn.org/image/favicon-ws.ico' NSFW: '//s.4cdn.org/image/favicon.ico' + # TODO dead: 'data:image/gif;base64,<%= readBase64("dead.gif") %>' logo: 'data:image/png;base64,<%= readBase64("/src/meta/icon128.png") %>' diff --git a/src/Monitoring/ReplyPruning.coffee b/src/Monitoring/ReplyPruning.coffee index 8be5983b4..7ec8c911f 100644 --- a/src/Monitoring/ReplyPruning.coffee +++ b/src/Monitoring/ReplyPruning.coffee @@ -16,7 +16,7 @@ ReplyPruning = el = $.el 'span', title: 'Maximum number of replies to show.' , - `<%= html(' ') %>` + `{innerHTML: " "}` $.prepend el, label @inputs = diff --git a/src/Monitoring/ThreadStats.coffee b/src/Monitoring/ThreadStats.coffee index 4f5f58c44..c06b01ad6 100644 --- a/src/Monitoring/ThreadStats.coffee +++ b/src/Monitoring/ThreadStats.coffee @@ -9,11 +9,7 @@ ThreadStats = if Conf['Page Count in Stats'] @[if g.SITE.isPrunedByAge?(g.BOARD) then 'showPurgePos' else 'showPage'] = true - statsHTML = `<%= html( - '? / ?' + - '?{Conf["IP Count in Stats"] && g.SITE.hasIPCount}{ / ?}' + - '?{Conf["Page Count in Stats"]}{ / ?}' - ) %>` + statsHTML = `{innerHTML: "? / ?" + ((Conf["IP Count in Stats"] && g.SITE.hasIPCount) ? " / ?" : "") + ((Conf["Page Count in Stats"]) ? " / ?" : "")}` statsTitle = 'Posts / Files' statsTitle += ' / IPs' if Conf['IP Count in Stats'] and g.SITE.hasIPCount statsTitle += (if @showPurgePos then ' / Purge Position' else ' / Page') if Conf['Page Count in Stats'] @@ -27,7 +23,7 @@ ThreadStats = else @dialog = sc = UI.dialog 'thread-stats', - `<%= html('
&{statsHTML}
') %>`
+ `{innerHTML: "" + (statsHTML).innerHTML + "
"}`
$.addClass doc, 'float'
$.ready ->
$.add d.body, sc
diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee
index fcee0a8e6..119db1cd9 100644
--- a/src/Monitoring/ThreadUpdater.coffee
+++ b/src/Monitoring/ThreadUpdater.coffee
@@ -1,3 +1,5 @@
+import Beep from './ThreadUpdater/beep.wav'
+
ThreadUpdater =
init: ->
return if g.VIEW isnt 'thread' or !Conf['Thread Updater']
@@ -12,11 +14,11 @@ ThreadUpdater =
if Conf['Updater and Stats in Header']
@dialog = sc = $.el 'span',
id: 'updater'
- $.extend sc, `<%= html('') %>`
+ $.extend sc, `{innerHTML: ''}`
Header.addShortcut 'updater', sc, 100
else
@dialog = sc = UI.dialog 'updater',
- `<%= html('') %>`
+ `{innerHTML: ''}`
$.addClass doc, 'float'
$.ready ->
$.add d.body, sc
@@ -31,7 +33,7 @@ ThreadUpdater =
updateLink = $.el 'span',
className: 'brackets-wrap updatelink'
- $.extend updateLink, `<%= html('Update') %>`
+ $.extend updateLink, `{innerHTML: 'Update'}`
Main.ready ->
($.add navLinksBot, [$.tn(' '), updateLink] if (navLinksBot = $ '.navLinksBot'))
$.on updateLink.firstElementChild, 'click', @update
@@ -50,7 +52,7 @@ ThreadUpdater =
subEntries.push el: el
@settings = $.el 'span',
- `<%= html('Interval') %>`
+ `{innerHTML: 'Interval'}`
$.on @settings, 'click', @intervalShortcut
@@ -65,7 +67,7 @@ ThreadUpdater =
Callbacks.Thread.push
name: 'Thread Updater'
cb: @node
-
+
node: ->
ThreadUpdater.thread = @
ThreadUpdater.root = @nodes.root
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 00e0caf61..85393692b 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -1,3 +1,5 @@
+import ThreadWatcherPage from './ThreadWatcher/ThreadWatcher.html'
+
ThreadWatcher =
init: ->
return if not (@enabled = Conf['Thread Watcher'])
@@ -11,7 +13,7 @@ ThreadWatcher =
@db = new DataBoard 'watchedThreads', @refresh, true
@dbLM = new DataBoard 'watcherLastModified', null, true
- @dialog = UI.dialog 'thread-watcher', `<%= readHTML('ThreadWatcher.html') %>`
+ @dialog = UI.dialog 'thread-watcher', `{ innerHTML: ThreadWatcherPage }`
@status = $ '#watcher-status', @dialog
@list = @dialog.lastElementChild
@refreshButton = $ '.refresh', @dialog
@@ -50,7 +52,7 @@ ThreadWatcher =
el: $.el 'a',
href: 'javascript:;'
className: 'has-shortcut-text'
- , `<%= html('Alt+click') %>`
+ , `{innerHTML: 'Alt+click'}`
order: 6
open: ({thread}) ->
return false if Conf['Index Mode'] isnt 'catalog'
diff --git a/src/Posting/Captcha.v2.coffee b/src/Posting/Captcha.v2.coffee
index de27a3d53..a29722efb 100644
--- a/src/Posting/Captcha.v2.coffee
+++ b/src/Posting/Captcha.v2.coffee
@@ -12,9 +12,9 @@ Captcha.v2 =
$.on d, 'CaptchaCount', @count.bind(@)
root = $.el 'div', className: 'captcha-root'
- $.extend root, `<%= html(
+ $.extend root, `{ innerHTML:
''
- ) %>`
+ }`
counter = $ '.captcha-counter > a', root
@nodes = {root, counter}
@count()
diff --git a/src/Posting/PassLink.coffee b/src/Posting/PassLink.coffee
index 3111a6d56..cee7ee076 100644
--- a/src/Posting/PassLink.coffee
+++ b/src/Posting/PassLink.coffee
@@ -8,7 +8,7 @@ PassLink =
passLink = $.el 'span',
className: 'brackets-wrap pass-link-container'
- $.extend passLink, `<%= html('4chan Pass') %>`
+ $.extend passLink, `{innerHTML: "4chan Pass"}`
$.on passLink.firstElementChild, 'click', ->
window.open "//sys.#{location.hostname.split('.')[1]}.org/auth",
Date.now()
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 1e2911b4c..1d64e54d0 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -1,3 +1,5 @@
+import QuickReplyPage from './QR/QuickReply.html'
+
QR =
mimeTypes: ['image/jpeg', 'image/png', 'image/gif', 'application/pdf', 'application/vnd.adobe.flash.movie', 'application/x-shockwave-flash', 'video/webm']
@@ -72,7 +74,7 @@ QR =
if (origToggle = $.id 'togglePostFormLink')
link = $.el 'h1',
className: "qr-link-container"
- $.extend link, `<%= html('?{g.VIEW === "thread"}{Reply to Thread}{Start a Thread}') %>`
+ $.extend link, `{innerHTML: '?{g.VIEW === "thread"}{Reply to Thread}{Start a Thread}'}`
QR.link = link.firstElementChild
$.on link.firstChild, 'click', ->
@@ -85,7 +87,7 @@ QR =
if g.VIEW is 'thread'
linkBot = $.el 'div',
className: "brackets-wrap qr-link-container-bottom"
- $.extend linkBot, `<%= html('Reply to Thread') %>`
+ $.extend linkBot, `{innerHTML: 'Reply to Thread'}`
$.on linkBot.firstElementChild, 'click', ->
QR.open()
@@ -243,10 +245,10 @@ QR =
connectionError: ->
$.el 'span',
- `<%= html(
+ `{ innerHTML:
'Connection error while posting. ' +
'[More info]'
- ) %>`
+ }`
notifications: []
@@ -369,7 +371,7 @@ QR =
openError: ->
div = $.el 'div'
- $.extend div, `<%= html('Could not open file. [More info]') %>`
+ $.extend div, `{ innerHTML: 'Could not open file. [More info]'}`
QR.error div
setFile: (e) ->
@@ -496,7 +498,7 @@ QR =
dialog: ->
QR.nodes = nodes =
el: dialog = UI.dialog 'qr',
- `<%= readHTML('QuickReply.html') %>`
+ `{ innerHTML: QuickReplyPage }`
setNode = (name, query) ->
nodes[name] = $ query, dialog
diff --git a/src/Posting/QR.post.coffee b/src/Posting/QR.post.coffee
index a658a82a2..b3177aeb2 100644
--- a/src/Posting/QR.post.coffee
+++ b/src/Posting/QR.post.coffee
@@ -4,7 +4,7 @@ QR.post = class
className: 'qr-preview'
draggable: true
href: 'javascript:;'
- $.extend el, `<%= html('') %>`
+ $.extend el, `{innerHTML: ''}`
@nodes =
el: el
@@ -185,7 +185,7 @@ QR.post = class
error: (className, message, link) ->
div = $.el 'div', {className}
- $.extend div, `<%= html('${message}?{link}{ [More info]}[delete post] [delete all]') %>` + $.extend div, `{innerHTML: '${message}?{link}{ [More info]}
[delete post] [delete all]'}` (@errors or= []).push div [rm, rmAll] = $$ 'a', div $.on div, 'click', => diff --git a/src/Quotelinks/QuoteThreading.coffee b/src/Quotelinks/QuoteThreading.coffee index 52352d07f..4efb83807 100644 --- a/src/Quotelinks/QuoteThreading.coffee +++ b/src/Quotelinks/QuoteThreading.coffee @@ -7,12 +7,12 @@ QuoteThreading = return unless Conf['Quote Threading'] and g.VIEW is 'thread' @controls = $.el 'label', - `<%= html(' Threading') %>` + `{innerHTML: " Threading"}` @threadNewLink = $.el 'span', className: 'brackets-wrap threadnewlink' hidden: true - $.extend @threadNewLink, `<%= html('Thread New Posts') %>` + $.extend @threadNewLink, `{innerHTML: "Thread New Posts"}` @input = $('input', @controls) @input.checked = Conf['Thread Quotes'] diff --git a/src/Quotelinks/QuoteYou.coffee b/src/Quotelinks/QuoteYou.coffee index e0d9836b8..b4f97ee75 100644 --- a/src/Quotelinks/QuoteYou.coffee +++ b/src/Quotelinks/QuoteYou.coffee @@ -59,7 +59,7 @@ QuoteYou = label = $.el 'label', className: 'toggle-you' , - `<%= html(' You') %>` + `{innerHTML: ' You'}` input = $ 'input', label $.on input, 'change', QuoteYou.menu.toggle Menu.menu?.addEntry diff --git a/src/classes/Fetcher.coffee b/src/classes/Fetcher.coffee index 1031fb856..cc9d045d9 100644 --- a/src/classes/Fetcher.coffee +++ b/src/classes/Fetcher.coffee @@ -149,10 +149,10 @@ class Fetcher greentext = text[0] is '>' text = text.replace /(\[\/?[a-z]+):lit(\])/g, '$1$2' text = for text2, j in text.split /(>>(?:>\/[a-z\d]+\/)?\d+)/g - `<%= html('?{j % 2}{${text2}}{${text2}}') %>` - text = `<%= html('?{greentext}{@{text}}{@{text}}') %>` + `{innerHTML: ((j % 2) ? "" + E(text2) + "" : E(text2))}` + text = `{innerHTML: ((greentext) ? "" + E.cat(text) + "" : E.cat(text))}` text - comment = `<%= html('@{comment}') %>` + comment = `{innerHTML: E.cat(comment)}` @threadID = +data.thread_num o = @@ -220,24 +220,24 @@ class Fetcher @insert post archiveTags: - '\n': `<%= html('
') %>` - '[b]': `<%= html('') %>` - '[/b]': `<%= html('') %>` - '[spoiler]': `<%= html('
') %>`
- '[/code]': `<%= html('') %>`
- '[moot]': `<%= html('') %>`
- '[/moot]': `<%= html('
') %>`
- '[banned]': `<%= html('') %>`
- '[/banned]': `<%= html('') %>`
- '[fortune]': (text) -> `<%= html('') %>`
- '[/fortune]': `<%= html('') %>`
- '[i]': `<%= html('') %>`
- '[/i]': `<%= html('') %>`
- '[red]': `<%= html('') %>`
- '[/red]': `<%= html('') %>`
- '[green]': `<%= html('') %>`
- '[/green]': `<%= html('') %>`
- '[blue]': `<%= html('') %>`
- '[/blue]': `<%= html('') %>`
+ '\n': `{innerHTML: ""}` + '[b]': `{innerHTML: ""}` + '[/b]': `{innerHTML: ""}` + '[spoiler]': `{innerHTML: "
"}`
+ '[/code]': `{innerHTML: ""}`
+ '[moot]': `{innerHTML: ""}`
+ '[/moot]': `{innerHTML: "
"}`
+ '[banned]': `{innerHTML: ""}`
+ '[/banned]': `{innerHTML: ""}`
+ '[fortune]': (text) -> `{innerHTML: ""}`
+ '[/fortune]': `{innerHTML: ""}`
+ '[i]': `{innerHTML: ""}`
+ '[/i]': `{innerHTML: ""}`
+ '[red]': `{innerHTML: ""}`
+ '[/red]': `{innerHTML: ""}`
+ '[green]': `{innerHTML: ""}`
+ '[/green]': `{innerHTML: ""}`
+ '[blue]': `{innerHTML: ""}`
+ '[/blue]': `{innerHTML: ""}`
diff --git a/src/classes/Notice.coffee b/src/classes/Notice.coffee
index bbebab5f6..ddbcb22f9 100644
--- a/src/classes/Notice.coffee
+++ b/src/classes/Notice.coffee
@@ -1,7 +1,7 @@
class Notice
constructor: (type, content, @timeout, @onclose) ->
@el = $.el 'div',
- `<%= html('') %>`
+ `{innerHTML: ""}`
@el.style.opacity = 0
@setType type
$.on @el.firstElementChild, 'click', @close
diff --git a/src/config/Config.coffee b/src/config/Config.coffee
index 4de0545c3..b4dda3856 100644
--- a/src/config/Config.coffee
+++ b/src/config/Config.coffee
@@ -1,3 +1,6 @@
+import userCss from './user.css'
+import banners from './banners.js'
+
Config =
main:
'Miscellaneous':
@@ -878,7 +881,7 @@ Config =
favicon: 'ferongr'
- usercss: `<%= JSON.stringify(read('user.css')) %>`
+ usercss: userCss
hotkeys:
# QR & Options
@@ -1168,7 +1171,7 @@ Config =
hiddenPSAList: [{}]
- knownBanners: '<%= readJSON("banners.json").join(",") %>'
+ knownBanners: banners.join(',')
passMessageClosed: false
diff --git a/src/config/banners.js b/src/config/banners.js
new file mode 100644
index 000000000..9cf65d742
--- /dev/null
+++ b/src/config/banners.js
@@ -0,0 +1,2 @@
+const banners = ["0.jpg", "1.jpg", "2.jpg", "4.jpg", "6.jpg", "7.jpg", "8.jpg", "9.jpg", "10.jpg", "11.jpg", "12.jpg", "13.jpg", "14.jpg", "16.jpg", "17.jpg", "18.jpg", "19.jpg", "20.jpg", "21.jpg", "22.jpg", "24.jpg", "25.jpg", "26.jpg", "28.jpg", "29.jpg", "33.jpg", "38.jpg", "39.jpg", "43.jpg", "44.jpg", "45.jpg", "46.jpg", "47.jpg", "52.jpg", "54.jpg", "57.jpg", "59.jpg", "60.jpg", "61.jpg", "64.jpg", "66.jpg", "67.jpg", "69.jpg", "71.jpg", "72.jpg", "76.jpg", "77.jpg", "81.jpg", "82.jpg", "83.jpg", "84.jpg", "88.jpg", "90.jpg", "91.jpg", "96.jpg", "98.jpg", "99.jpg", "100.jpg", "104.jpg", "106.jpg", "116.jpg", "119.jpg", "137.jpg", "140.jpg", "148.jpg", "149.jpg", "150.jpg", "154.jpg", "156.jpg", "157.jpg", "158.jpg", "159.jpg", "161.jpg", "162.jpg", "164.jpg", "165.jpg", "166.jpg", "167.jpg", "168.jpg", "169.jpg", "170.jpg", "171.jpg", "172.jpg", "173.jpg", "174.jpg", "175.jpg", "176.jpg", "178.jpg", "179.jpg", "180.jpg", "181.jpg", "182.jpg", "183.jpg", "186.jpg", "189.jpg", "190.jpg", "192.jpg", "193.jpg", "194.jpg", "197.jpg", "198.jpg", "200.jpg", "201.jpg", "202.jpg", "203.jpg", "205.jpg", "206.jpg", "207.jpg", "208.jpg", "210.jpg", "213.jpg", "214.jpg", "215.jpg", "216.jpg", "218.jpg", "219.jpg", "220.jpg", "221.jpg", "222.jpg", "223.jpg", "224.jpg", "227.jpg", "0.png", "1.png", "2.png", "3.png", "5.png", "6.png", "9.png", "10.png", "11.png", "12.png", "14.png", "16.png", "19.png", "20.png", "21.png", "22.png", "23.png", "24.png", "26.png", "27.png", "28.png", "29.png", "30.png", "31.png", "32.png", "33.png", "34.png", "37.png", "39.png", "40.png", "41.png", "42.png", "43.png", "44.png", "45.png", "48.png", "49.png", "50.png", "51.png", "52.png", "53.png", "57.png", "58.png", "59.png", "64.png", "66.png", "67.png", "68.png", "69.png", "70.png", "71.png", "72.png", "76.png", "78.png", "79.png", "81.png", "82.png", "85.png", "86.png", "87.png", "89.png", "95.png", "98.png", "100.png", "101.png", "102.png", "105.png", "106.png", "107.png", "109.png", "110.png", "111.png", "112.png", "113.png", "114.png", "115.png", "116.png", "118.png", "119.png", "120.png", "121.png", "122.png", "123.png", "126.png", "128.png", "130.png", "134.png", "136.png", "138.png", "139.png", "140.png", "142.png", "145.png", "146.png", "149.png", "150.png", "151.png", "152.png", "153.png", "154.png", "155.png", "156.png", "157.png", "158.png", "159.png", "160.png", "163.png", "164.png", "165.png", "166.png", "167.png", "168.png", "169.png", "170.png", "171.png", "172.png", "173.png", "174.png", "178.png", "179.png", "180.png", "181.png", "182.png", "184.png", "186.png", "188.png", "190.png", "192.png", "193.png", "194.png", "195.png", "196.png", "197.png", "198.png", "200.png", "202.png", "203.png", "205.png", "206.png", "207.png", "209.png", "212.png", "213.png", "214.png", "216.png", "217.png", "218.png", "219.png", "220.png", "221.png", "222.png", "223.png", "224.png", "225.png", "226.png", "229.png", "231.png", "232.png", "233.png", "234.png", "235.png", "237.png", "238.png", "239.png", "240.png", "241.png", "242.png", "244.png", "245.png", "246.png", "247.png", "248.png", "249.png", "250.png", "253.png", "254.png", "255.png", "256.png", "257.png", "258.png", "259.png", "260.png", "262.png", "268.png", "0.gif", "1.gif", "2.gif", "3.gif", "4.gif", "5.gif", "6.gif", "7.gif", "8.gif", "9.gif", "10.gif", "12.gif", "13.gif", "14.gif", "15.gif", "16.gif", "18.gif", "19.gif", "20.gif", "21.gif", "22.gif", "23.gif", "24.gif", "28.gif", "29.gif", "30.gif", "33.gif", "34.gif", "35.gif", "36.gif", "37.gif", "39.gif", "40.gif", "42.gif", "44.gif", "45.gif", "46.gif", "48.gif", "50.gif", "52.gif", "54.gif", "55.gif", "57.gif", "58.gif", "59.gif", "60.gif", "61.gif", "63.gif", "64.gif", "66.gif", "67.gif", "68.gif", "69.gif", "70.gif", "72.gif", "73.gif", "75.gif", "76.gif", "77.gif", "78.gif", "80.gif", "81.gif", "82.gif", "83.gif", "86.gif", "87.gif", "88.gif", "92.gif", "93.gif", "94.gif", "95.gif", "96.gif", "97.gif", "98.gif", "99.gif", "100.gif", "101.gif", "102.gif", "103.gif", "104.gif", "105.gif", "106.gif", "108.gif", "109.gif", "110.gif", "111.gif", "112.gif", "113.gif", "115.gif", "116.gif", "117.gif", "118.gif", "119.gif", "120.gif", "122.gif", "123.gif", "124.gif", "127.gif", "129.gif", "130.gif", "131.gif", "134.gif", "135.gif", "136.gif", "138.gif", "139.gif", "141.gif", "144.gif", "146.gif", "148.gif", "149.gif", "153.gif", "154.gif", "155.gif", "157.gif", "158.gif", "159.gif", "160.gif", "161.gif", "162.gif", "164.gif", "166.gif", "167.gif", "168.gif", "169.gif", "170.gif", "171.gif", "172.gif", "173.gif", "174.gif", "175.gif", "176.gif", "177.gif", "178.gif", "181.gif", "182.gif", "183.gif", "185.gif", "186.gif", "187.gif", "188.gif", "189.gif", "190.gif", "191.gif", "192.gif", "193.gif", "195.gif", "196.gif", "197.gif", "200.gif", "201.gif", "202.gif", "203.gif", "204.gif", "205.gif", "206.gif", "207.gif", "208.gif", "209.gif", "210.gif", "211.gif", "212.gif", "213.gif", "214.gif", "215.gif", "216.gif", "217.gif", "219.gif", "220.gif", "221.gif", "222.gif", "224.gif", "225.gif", "226.gif", "227.gif", "228.gif", "230.gif", "232.gif", "233.gif", "234.gif", "235.gif", "238.gif", "240.gif", "241.gif", "243.gif", "244.gif", "245.gif", "246.gif", "247.gif", "249.gif", "250.gif", "251.gif", "253.gif"];
+export default banners;
diff --git a/src/config/banners.json b/src/config/banners.json
deleted file mode 100644
index 785cc8306..000000000
--- a/src/config/banners.json
+++ /dev/null
@@ -1 +0,0 @@
-["0.jpg", "1.jpg", "2.jpg", "4.jpg", "6.jpg", "7.jpg", "8.jpg", "9.jpg", "10.jpg", "11.jpg", "12.jpg", "13.jpg", "14.jpg", "16.jpg", "17.jpg", "18.jpg", "19.jpg", "20.jpg", "21.jpg", "22.jpg", "24.jpg", "25.jpg", "26.jpg", "28.jpg", "29.jpg", "33.jpg", "38.jpg", "39.jpg", "43.jpg", "44.jpg", "45.jpg", "46.jpg", "47.jpg", "52.jpg", "54.jpg", "57.jpg", "59.jpg", "60.jpg", "61.jpg", "64.jpg", "66.jpg", "67.jpg", "69.jpg", "71.jpg", "72.jpg", "76.jpg", "77.jpg", "81.jpg", "82.jpg", "83.jpg", "84.jpg", "88.jpg", "90.jpg", "91.jpg", "96.jpg", "98.jpg", "99.jpg", "100.jpg", "104.jpg", "106.jpg", "116.jpg", "119.jpg", "137.jpg", "140.jpg", "148.jpg", "149.jpg", "150.jpg", "154.jpg", "156.jpg", "157.jpg", "158.jpg", "159.jpg", "161.jpg", "162.jpg", "164.jpg", "165.jpg", "166.jpg", "167.jpg", "168.jpg", "169.jpg", "170.jpg", "171.jpg", "172.jpg", "173.jpg", "174.jpg", "175.jpg", "176.jpg", "178.jpg", "179.jpg", "180.jpg", "181.jpg", "182.jpg", "183.jpg", "186.jpg", "189.jpg", "190.jpg", "192.jpg", "193.jpg", "194.jpg", "197.jpg", "198.jpg", "200.jpg", "201.jpg", "202.jpg", "203.jpg", "205.jpg", "206.jpg", "207.jpg", "208.jpg", "210.jpg", "213.jpg", "214.jpg", "215.jpg", "216.jpg", "218.jpg", "219.jpg", "220.jpg", "221.jpg", "222.jpg", "223.jpg", "224.jpg", "227.jpg", "0.png", "1.png", "2.png", "3.png", "5.png", "6.png", "9.png", "10.png", "11.png", "12.png", "14.png", "16.png", "19.png", "20.png", "21.png", "22.png", "23.png", "24.png", "26.png", "27.png", "28.png", "29.png", "30.png", "31.png", "32.png", "33.png", "34.png", "37.png", "39.png", "40.png", "41.png", "42.png", "43.png", "44.png", "45.png", "48.png", "49.png", "50.png", "51.png", "52.png", "53.png", "57.png", "58.png", "59.png", "64.png", "66.png", "67.png", "68.png", "69.png", "70.png", "71.png", "72.png", "76.png", "78.png", "79.png", "81.png", "82.png", "85.png", "86.png", "87.png", "89.png", "95.png", "98.png", "100.png", "101.png", "102.png", "105.png", "106.png", "107.png", "109.png", "110.png", "111.png", "112.png", "113.png", "114.png", "115.png", "116.png", "118.png", "119.png", "120.png", "121.png", "122.png", "123.png", "126.png", "128.png", "130.png", "134.png", "136.png", "138.png", "139.png", "140.png", "142.png", "145.png", "146.png", "149.png", "150.png", "151.png", "152.png", "153.png", "154.png", "155.png", "156.png", "157.png", "158.png", "159.png", "160.png", "163.png", "164.png", "165.png", "166.png", "167.png", "168.png", "169.png", "170.png", "171.png", "172.png", "173.png", "174.png", "178.png", "179.png", "180.png", "181.png", "182.png", "184.png", "186.png", "188.png", "190.png", "192.png", "193.png", "194.png", "195.png", "196.png", "197.png", "198.png", "200.png", "202.png", "203.png", "205.png", "206.png", "207.png", "209.png", "212.png", "213.png", "214.png", "216.png", "217.png", "218.png", "219.png", "220.png", "221.png", "222.png", "223.png", "224.png", "225.png", "226.png", "229.png", "231.png", "232.png", "233.png", "234.png", "235.png", "237.png", "238.png", "239.png", "240.png", "241.png", "242.png", "244.png", "245.png", "246.png", "247.png", "248.png", "249.png", "250.png", "253.png", "254.png", "255.png", "256.png", "257.png", "258.png", "259.png", "260.png", "262.png", "268.png", "0.gif", "1.gif", "2.gif", "3.gif", "4.gif", "5.gif", "6.gif", "7.gif", "8.gif", "9.gif", "10.gif", "12.gif", "13.gif", "14.gif", "15.gif", "16.gif", "18.gif", "19.gif", "20.gif", "21.gif", "22.gif", "23.gif", "24.gif", "28.gif", "29.gif", "30.gif", "33.gif", "34.gif", "35.gif", "36.gif", "37.gif", "39.gif", "40.gif", "42.gif", "44.gif", "45.gif", "46.gif", "48.gif", "50.gif", "52.gif", "54.gif", "55.gif", "57.gif", "58.gif", "59.gif", "60.gif", "61.gif", "63.gif", "64.gif", "66.gif", "67.gif", "68.gif", "69.gif", "70.gif", "72.gif", "73.gif", "75.gif", "76.gif", "77.gif", "78.gif", "80.gif", "81.gif", "82.gif", "83.gif", "86.gif", "87.gif", "88.gif", "92.gif", "93.gif", "94.gif", "95.gif", "96.gif", "97.gif", "98.gif", "99.gif", "100.gif", "101.gif", "102.gif", "103.gif", "104.gif", "105.gif", "106.gif", "108.gif", "109.gif", "110.gif", "111.gif", "112.gif", "113.gif", "115.gif", "116.gif", "117.gif", "118.gif", "119.gif", "120.gif", "122.gif", "123.gif", "124.gif", "127.gif", "129.gif", "130.gif", "131.gif", "134.gif", "135.gif", "136.gif", "138.gif", "139.gif", "141.gif", "144.gif", "146.gif", "148.gif", "149.gif", "153.gif", "154.gif", "155.gif", "157.gif", "158.gif", "159.gif", "160.gif", "161.gif", "162.gif", "164.gif", "166.gif", "167.gif", "168.gif", "169.gif", "170.gif", "171.gif", "172.gif", "173.gif", "174.gif", "175.gif", "176.gif", "177.gif", "178.gif", "181.gif", "182.gif", "183.gif", "185.gif", "186.gif", "187.gif", "188.gif", "189.gif", "190.gif", "191.gif", "192.gif", "193.gif", "195.gif", "196.gif", "197.gif", "200.gif", "201.gif", "202.gif", "203.gif", "204.gif", "205.gif", "206.gif", "207.gif", "208.gif", "209.gif", "210.gif", "211.gif", "212.gif", "213.gif", "214.gif", "215.gif", "216.gif", "217.gif", "219.gif", "220.gif", "221.gif", "222.gif", "224.gif", "225.gif", "226.gif", "227.gif", "228.gif", "230.gif", "232.gif", "233.gif", "234.gif", "235.gif", "238.gif", "240.gif", "241.gif", "243.gif", "244.gif", "245.gif", "246.gif", "247.gif", "249.gif", "250.gif", "251.gif", "253.gif"]
\ No newline at end of file
diff --git a/src/main/Main.coffee b/src/main/Main.coffee
index cc0ef0aef..9065d0984 100644
--- a/src/main/Main.coffee
+++ b/src/main/Main.coffee
@@ -330,7 +330,7 @@ Main =
if g.SITE.isIncomplete?()
msg = $.el 'div',
- `<%= html('The page didn't load completely.Some features may not work unless you reload.') %>` + `{innerHTML: 'The page didn't load completely.
Some features may not work unless you reload.'}` $.on $('a', msg), 'click', -> location.reload() new Notice 'warning', msg @@ -518,7 +518,7 @@ Main = unless nodes[i] (cb() if cb) return - setTimeout softTask, 0 + setTimeout softTask, 0 softTask() @@ -547,7 +547,7 @@ Main = return div = $.el 'div', - `<%= html('${errors.length} errors occurred.&{Main.reportLink(errors)} [show]') %>` + `{innerHTML: '${errors.length} errors occurred.&{Main.reportLink(errors)} [show]'}` $.on div.lastElementChild, 'click', -> [@textContent, logs.hidden] = if @textContent is 'show' then ( ['hide', false] @@ -565,7 +565,7 @@ Main = parseError: (data, reportLink) -> c.error data.message, data.error.stack message = $.el 'div', - `<%= html('${data.message}?{reportLink}{&{reportLink}}') %>` + `{innerHTML: '${data.message}?{reportLink}{&{reportLink}}'}` error = $.el 'div', textContent: "#{data.error.name or 'Error'}: #{data.error.message or 'see console for details'}" lines = data.error.stack?.match(/\d+(?=:\d+\)?$)/mg)?.join().replace(/^/, ' at ') or '' @@ -595,7 +595,7 @@ Main = addDetails '\n`' + data.html + '`' if data.html details = details.replace /file:\/{3}.+\//g, '' # Remove local file paths url = '<%= meta.newIssue %>'.replace('%title', encodeURIComponent title).replace('%details', encodeURIComponent details) - `<%= html(' [report]') %>` + `{innerHTML: ' [report]'}` isThisPageLegit: -> # not 404 error page or similar. diff --git a/src/platform/$.coffee b/src/platform/$.coffee index 342d16a3d..7c2c4646e 100644 --- a/src/platform/$.coffee +++ b/src/platform/$.coffee @@ -552,7 +552,7 @@ $.crxWorking = -> return true unless $.crxWarningShown msg = $.el 'div', - `<%= html('4chan X seems to have been updated. You will need to reload the page.') %>` + `{innerHTML: '4chan X seems to have been updated. You will need to reload the page.'}` $.on $('a', msg), 'click', -> location.reload() new Notice 'warning', msg $.crxWarningShown = true diff --git a/src/site/SW.yotsuba.Build.coffee b/src/site/SW.yotsuba.Build.coffee index a13534dc8..3d282ee17 100644 --- a/src/site/SW.yotsuba.Build.coffee +++ b/src/site/SW.yotsuba.Build.coffee @@ -1,3 +1,9 @@ +import PostInfoPage from './SW.yotsuba.Build/PostInfo.html' +import FilePage from './SW.yotsuba.Build/File.html' +import PostPage from './SW.yotsuba.Build/Post.html' +import CatalogThreadPage from './SW.yotsuba.Build/CatalogThread.html' +import CatalogReplyPage from './SW.yotsuba.Build/CatalogReply.html' + Build = staticPath: '//s.4cdn.org/image/' gifIcon: if window.devicePixelRatio >= 2 then '@2x.gif' else '.gif' @@ -145,7 +151,7 @@ Build = else "#{url}#q#{ID}" - postInfo = `<%= readHTML('PostInfo.html') %>` + postInfo = { innerHTML: PostInfoPage } ### File Info ### @@ -155,13 +161,13 @@ Build = shortFilename = Build.shortFilename file.name fileThumb = if file.isSpoiler then Build.spoilerThumb(boardID) else file.thumbURL.replace(protocol, '') - fileBlock = `<%= readHTML('File.html') %>` + fileBlock = { innerHTML: FilePage } ### Whole Post ### postClass = if o.isReply then 'reply' else 'op' - wholePost = `<%= readHTML('Post.html') %>` + wholePost = `{ innerHTML: PostPage }` container = $.el 'div', className: "postContainer #{postClass}Container" @@ -238,7 +244,7 @@ Build = postCount = data.replies + 1 fileCount = data.images + !!data.ext - container = $.el 'div', `<%= readHTML('CatalogThread.html') %>` + container = $.el 'div', { innerHTML: CatalogThreadPage } $.before thread.OP.nodes.info, [container.childNodes...] for br in $$('br', thread.OP.nodes.comment) when br.previousSibling and br.previousSibling.nodeName is 'BR' @@ -266,6 +272,6 @@ Build = link = Build.postURL thread.board.ID, thread.ID, data.no $.el 'div', {className: 'catalog-reply'}, - `<%= readHTML('CatalogReply.html') %>` + `{ innerHTML: CatalogReplyPage }` SW.yotsuba.Build = Build diff --git a/tools/rollup-plugin-inline-file.js b/tools/rollup-plugin-inline-file.js new file mode 100644 index 000000000..df9b9c5f3 --- /dev/null +++ b/tools/rollup-plugin-inline-file.js @@ -0,0 +1,29 @@ +import { createFilter } from "rollup-pluginutils"; + +export default function inlineFile(opts = {}) { + if (!opts.include) { + throw Error("include option should be specified"); + } + + if (opts.transformer && typeof opts.transformer !== 'function') { + throw new Error('If transformer is given, it must be a function'); + } + + const filter = createFilter(opts.include, opts.exclude); + + return { + name: "inlineFile", + + transform(code, id) { + if (filter(id)) { + if (opts.transformer) { + code = opts.transformer(code); + } + return { + code: `export default ${JSON.stringify(code)};`, + map: { mappings: "" } + }; + } + } + }; +} \ No newline at end of file diff --git a/tools/rollup.js b/tools/rollup.js new file mode 100644 index 000000000..4758a3cbc --- /dev/null +++ b/tools/rollup.js @@ -0,0 +1,16 @@ +import { rollup } from "rollup"; +import inlineFile from "./rollup-plugin-inline-file"; + +rollup({ + entry: "main.js", + plugins: [ + inlineFile({ + include: ["**/*.html", "**/*.css"], + }), + inlineFile({ + include: ["**/*.png", "**/*.gif"], + // base64 encode + transformer: btoa + }) + ] +}); \ No newline at end of file