From fa2ed2218a5b3cffd7ef13e54394baf51926e22d Mon Sep 17 00:00:00 2001 From: ccd0 Date: Fri, 12 Sep 2014 22:31:54 -0700 Subject: [PATCH 1/4] partially revert ef99677f142c6b2dadb0e3f70745f0c4b14cf7d4 --- src/General/Index.coffee | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/General/Index.coffee b/src/General/Index.coffee index e30e53f80..e305c100b 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -385,22 +385,12 @@ Index = sortedNodes.push nodes[Index.liveThreadIDs.indexOf(threadID)] if Index.isSearching and nodes = Index.querySearch(Index.searchInput.value) Index.sortedNodes = nodes - items = [ - # Sticky threads - fn: (thread) -> thread.isSticky - cnd: true - , # Highlighted threads - fn: (thread) -> thread.isOnTop - cnd: Conf['Filter'] - , # Non-hidden threads - fn: (thread) -> !thread.isHidden - cnd: Conf['Anchor Hidden Threads'] - ] - i = 0 - while item = items[i++] - {fn, cnd} = item - Index.sortOnTop fn if cnd - return + # Sticky threads + Index.sortOnTop (thread) -> thread.isSticky + # Highlighted threads + Index.sortOnTop((thread) -> thread.isOnTop) if Conf['Filter'] + # Non-hidden threads + Index.sortOnTop((thread) -> !thread.isHidden) if Conf['Anchor Hidden Threads'] sortOnTop: (match) -> topNodes = [] From 97cd4f47eaeb4fa79e5154ac28b04439fd0a5518 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 13 Sep 2014 11:50:26 -0700 Subject: [PATCH 2/4] non-catalog part of menu refactoring from Mayhem commit 60e89e3f28dcb5cb5936f31940c786117ba5240a --- src/Menu/Menu.coffee | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Menu/Menu.coffee b/src/Menu/Menu.coffee index 20a2992b6..cd89585ee 100755 --- a/src/Menu/Menu.coffee +++ b/src/Menu/Menu.coffee @@ -2,6 +2,11 @@ Menu = init: -> return if g.VIEW is 'catalog' or !Conf['Menu'] + @button = $.el 'a', + className: 'menu-button' + href: 'javascript:;' + $.extend @button, <%= html('') %> + @menu = new UI.Menu 'post' Post.callbacks.push name: 'Menu' @@ -13,15 +18,10 @@ Menu = return $.add @nodes.info, Menu.makeButton() - makeButton: do -> - a = $.el 'a', - className: 'menu-button' - href: 'javascript:;' - $.extend a, <%= html('') %> - -> - button = a.cloneNode true - $.on button, 'click', Menu.toggle - button + makeButton: -> + clone = Menu.button.cloneNode true + $.on clone, 'click', Menu.toggle + clone toggle: (e) -> post = Get.postFromNode @ From d9d0ce65d7ca4e14f2f688d01550af687ae98751 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 13 Sep 2014 12:22:55 -0700 Subject: [PATCH 3/4] Fix minimum Chrome version. Should have been updated at f5047e8fddcacca439df8928cf19b9209e2c7814. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 83c22a1ef..2bb782609 100755 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "noupdate": "-noupdate" }, "min": { - "chrome": "31", + "chrome": "32", "firefox": "26", "greasemonkey": "1.14" } @@ -57,4 +57,4 @@ "engines": { "node": ">=0.10" } -} \ No newline at end of file +} From 9ffc3232ced667fd889c3c64fd30accfd03ebfef Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 13 Sep 2014 13:07:15 -0700 Subject: [PATCH 4/4] quote attributes --- src/General/css/style.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/General/css/style.css b/src/General/css/style.css index c56cbd85c..00eccef2d 100755 --- a/src/General/css/style.css +++ b/src/General/css/style.css @@ -532,7 +532,7 @@ span.hide-announcement { #updater > div:last-child { text-align: center; } -#updater input[type=number] { +#updater input[type="number"] { width: 4em; } :root.float #updater { @@ -810,7 +810,7 @@ span.hide-announcement { :root.hide-original-post-form #togglePostFormLink, :root:not(.catalog) #togglePostFormLink, #qr.autohide:not(.focus):not(:hover):not(:active) > form, -:root.thread-view #qr:not(.show-new-thread-option) select[data-name=thread], +:root.thread-view #qr:not(.show-new-thread-option) select[data-name="thread"], #file-n-submit:not(.has-file) #qr-filerm { display: none; } @@ -896,9 +896,9 @@ span.hide-announcement { flex: 1; width: 0; } -#qr.forced-anon input[data-name=name]:not(.force-show), -#qr.forced-anon input[data-name=sub]:not(.force-show), -#qr.reply-to-thread input[data-name=sub]:not(.force-show) { +#qr.forced-anon input[data-name="name"]:not(.force-show), +#qr.forced-anon input[data-name="sub"]:not(.force-show), +#qr.reply-to-thread input[data-name="sub"]:not(.force-show) { display: none; } #qr textarea.field { @@ -938,11 +938,11 @@ input.field.tripped:not(:hover):not(:focus) { #qr textarea { min-width: 100%; } -#qr [type='submit'] { +#qr [type="submit"] { width: 25%; vertical-align: top; } -:root.webkit #qr [type='submit'] { +:root.webkit #qr [type="submit"] { height: 24px; } #qr label input[type="checkbox"] { @@ -1006,12 +1006,12 @@ input#qr-filename:not(.edit) { #file-n-submit { height: 23px; } -#qr input[type=file] { +#qr input[type="file"] { visibility: hidden; position: absolute; } /* Thread Select / Spoiler Label */ -#qr select[data-name=thread] { +#qr select[data-name="thread"] { float: right; } #qr.has-spoiler .has-file #qr-spoiler-label {