Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js

.gitignore

@@ -3,6 +3,5 @@ node_modules/
 *.db
 tmp-crx/
 tmp-userscript/
-builds/4chan-X-Chrome.zip
+builds/4chan-X.zip
-builds/4chan-X-Opera.nex
 Gruntfile.js

CHANGELOG.md

@@ -1,37 +1,28 @@
+### v1.2.27
+*2013-08-12*
+
+**seaweedchan**:
+- Fix minor class name change from last version's merge
+
+### v1.2.26
+*2013-08-12*
+
 **MayhemYDG**:
-- **New feature**: `Show Dice Roll` (with @carboncopy)
+- Show dice rolls that were entered into the email field on /tg/.
- - Shows dice that were entered into the email field on /tg/.
-- **Thread Watcher** improvements:
- - It is now possible to open all watched threads via the `Open all threads` button in the Thread Watcher's menu.
- - Added the `Current Board` setting to switch between showing watched threads from the current board or all boards, disabled by default.
- - About dead (404'd) threads:
- <ul>
-  <li> Dead threads will be typographically indicated with a strikethrough.
-  <li> Dead threads will directly link to the corresponding archive when available.
-  <li> A button to prune all 404'd threads from the list is now available.
-  <li> Added the `Auto Prune` setting to automatically prune 404'd threads, disabled by default.
- </ul>
- - The current thread is now highlighted in the list of watched threads.
- - Watching the current thread can be done in the Header's menu too.
-- Removed the `Check for Updates` setting:
- - Your browser/userscript manager should handle updates itself automatically.
-- Fix impossibility to create new threads when in dead threads.
 - Fix flag filtering on /sp/ and /int/.
-- Update archives. (with @woxxy and @proplex)
 - Minor fixes.
 - Minor optimizations.
 
+**seaweedchan**:
+- Change new error message to link to ban page just in case
+
 **Zixaphir**:
 - Linkifier Rewrite.
-- Fix Quote Threading toggle.
 - Added Twitch.tv and Vine embedding (with @ihavenoface)
 - Keybinds to scroll to posts that quote you.
 - Minor optimizations.
 - Minor fixes.
 
-**aeosynth**:
-- Update Gruntfile.coffee.
-
 ### v1.2.25
 *2013-08-04*
 

Gruntfile.coffee

@@ -1,5 +1,6 @@
 module.exports = (grunt) ->
 
+  pkg = grunt.file.readJSON 'package.json'
   concatOptions =
     process: Object.create(null, data:
       get: -> grunt.config 'pkg'
@@ -12,7 +13,7 @@ module.exports = (grunt) ->
 
   # Project configuration.
   grunt.initConfig
-    pkg: grunt.file.readJSON 'package.json'
+    pkg: pkg
     concat:
       coffee:
         options: concatOptions
@@ -168,35 +169,39 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'release', [
     'build'
+    'compress:crx'
     'shell:commit'
     'shell:push'
-    'build-crx'
-    'compress:crx'
   ]
   grunt.registerTask 'patch', [
     'bump'
+    'reloadPkg'
     'updcl:3'
-    'release'
   ]
 
   grunt.registerTask 'minor', [
     'bump:minor'
+    'reloadPkg'
     'updcl:2'
-    'release'
   ]
 
   grunt.registerTask 'major', [
     'bump:major'
+    'reloadPkg'
     'updcl:1'
-    'release'
   ]
 
-  grunt.registerTask 'updcl', 'Update the changelog', (headerLevel) ->
+  grunt.registerTask 'reloadPkg', 'Reload the package', ->
-    headerPrefix = new Array(+headerLevel + 1).join '#'
+    # Update the `pkg` object with the new version.
-    {version} = grunt.config 'pkg'
+    pkg = grunt.file.readJSON('package.json')
-    today     = grunt.template.today 'yyyy-mm-dd'
+    grunt.config.data.pkg = concatOptions.process.data = pkg
-    changelog = grunt.file.read 'CHANGELOG.md'
+    grunt.log.ok('pkg reloaded.')
 
-    grunt.file.write 'CHANGELOG.md', "#{headerPrefix} #{version} - *#{today}*\n\n#{changelog}"
+  grunt.registerTask 'updcl',   'Update the changelog', (i) ->
-    grunt.log.ok "Changelog updated for v#{version}."
+    # i is the number of #s for markdown.
+    version = []
+    version.length = +i + 1
+    version = version.join('#') + ' v' + pkg.version + '\n*' + grunt.template.today('yyyy-mm-dd') + '*\n'
+    grunt.file.write 'CHANGELOG.md', version + '\n' + grunt.file.read('CHANGELOG.md')
+    grunt.log.ok     'Changelog updated for v' + pkg.version + '.'
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.2.25 - 2013-08-14
+* 4chan X - Version 1.2.27 - 2013-08-14
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.2.25
+// @version      1.2.27
 // @namespace    4chan-X
 // @description  Cross-browser userscript for maximum lurking on 4chan.
 // @license      MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE 

builds/crx/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan X",
-  "version": "1.2.25",
+  "version": "1.2.27",
   "manifest_version": 2,
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "icons": {
@@ -15,8 +15,7 @@
     "run_at": "document_start"
   }],
   "homepage_url": "http://seaweedchan.github.io/4chan-x/",
-  "minimum_chrome_version": "27",
+  "minimum_chrome_version": "26",
-  "minimum_opera_version": "15",
   "permissions": [
     "storage"
   ]

css/style.css

@@ -1,950 +0,0 @@
-/* General */
-.dialog {
-  box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
-  border: 1px solid;
-  display: block;
-  padding: 0;
-}
-.field {
-  background-color: #FFF;
-  border: 1px solid #CCC;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  color: #333;
-  font-family: inherit;
-  font-size: 13px;
-  margin: 0;
-  padding: 2px 4px 3px;
-  outline: none;
-  transition: color .25s, border-color .25s, -webkit-flex .25s;
-  transition: color .25s, border-color .25s, flex .25s;
-}
-.field::-moz-placeholder,
-.field:hover::-moz-placeholder {
-  color: #AAA !important;
-}
-.field:hover {
-  border-color: #999;
-}
-.field:hover, .field:focus {
-  color: #000;
-}
-.field[disabled] {
-  background-color: #F2F2F2;
-  color: #888;
-}
-.move {
-  cursor: move;
-}
-label, .watcher-toggler {
-  cursor: pointer;
-}
-a[href="javascript:;"] {
-  text-decoration: none;
-}
-.warning {
-  color: red;
-}
-
-/* 4chan style fixes */
-.opContainer, .op {
-  display: block !important;
-}
-.post {
-  overflow: visible !important;
-}
-[hidden] {
-  display: none !important;
-}
-
-/* fixed, z-index */
-#overlay,
-#qp, #ihover,
-#updater, #thread-stats,
-#navlinks, #header,
-#qr {
-  position: fixed;
-}
-#overlay {
-  z-index: 999;
-}
-#notifications {
-  z-index: 70;
-}
-#qp, #ihover {
-  z-index: 60;
-}
-#menu {
-  z-index: 50;
-}
-#navlinks, #updater, #thread-stats {
-  z-index: 40;
-}
-#qr {
-  z-index: 30;
-}
-#thread-watcher:hover {
-  z-index: 20;
-}
-#header {
-  z-index: 10;
-}
-#thread-watcher {
-  z-index: 5;
-}
-
-/* Header */
-:root.top-header body {
-  margin-top: 2em;
-}
-:root.bottom-header body {
-  margin-bottom: 2em;
-}
-:root.fourchan-x #navtopright,
-:root.fourchan-x #navbotright,
-:root.fourchan-x:not(.show-original-top-board-list) #boardNavDesktop,
-:root.fourchan-x:not(.show-original-bot-board-list) #boardNavDesktopFoot {
-  display: none !important;
-}
-#header {
-  right: 0;
-  left: 0;
-}
-#header.top {
-  top: 0;
-}
-#header.bottom {
-  bottom: 0;
-}
-#header-bar {
-  border-width: 0;
-  display: -webkit-flex;
-  display: flex;
-  padding: 3px 4px 4px;
-  position: relative;
-  transition: all .1s .05s ease-in-out;
-}
-#header.top #header-bar {
-  border-bottom-width: 1px;
-}
-#header.bottom #header-bar {
-  box-shadow: 0 -1px 2px rgba(0, 0, 0, .15);
-  border-top-width: 1px;
-}
-#header.bottom .menu-button i {
-  border-top: none;
-  border-bottom: 6px solid;
-}
-#board-list {
-  -webkit-flex: 1;
-  flex: 1;
-  text-align: center;
-}
-#header-bar.autohide:not(:hover) {
-  box-shadow: none;
-  transition: all .8s .6s cubic-bezier(.55, .055, .675, .19);
-}
-#header.top #header-bar.autohide:not(:hover) {
-  margin-bottom: -1em;
-  -webkit-transform: translateY(-100%);
-  transform: translateY(-100%);
-}
-#header.bottom #header-bar.autohide:not(:hover) {
-  -webkit-transform: translateY(100%);
-  transform: translateY(100%);
-}
-#toggle-header-bar {
-  left: 0;
-  right: 0;
-  height: 10px;
-  position: absolute;
-}
-#header.top #toggle-header-bar {
-  cursor: n-resize;
-  bottom: -8px;
-}
-#header.bottom #toggle-header-bar {
-  cursor: s-resize;
-  top: -8px;
-}
-#header-bar.autohide:not(:hover) #toggle-header-bar,
-#toggle-header-bar:hover {
-  height: 18px;
-}
-#header.top #header-bar.autohide:not(:hover) #toggle-header-bar,
-#header.top #toggle-header-bar:hover {
-  bottom: -16px;
-}
-#header.bottom #header-bar.autohide:not(:hover) #toggle-header-bar,
-#header.bottom #toggle-header-bar:hover {
-  top: -16px;
-}
-#header.top #header-bar.autohide #toggle-header-bar {
-  cursor: s-resize;
-}
-#header.bottom #header-bar.autohide #toggle-header-bar {
-  cursor: n-resize;
-}
-#header-bar a:not(.entry) {
-  text-decoration: none;
-  padding: 1px;
-}
-.shortcut:not(:last-child)::after {
-  content: " / ";
-}
-.brackets-wrap::before {
-  content: "\\00a0[";
-}
-.brackets-wrap::after {
-  content: "]\\00a0";
-}
-.expand-all-shortcut {
-  opacity: .35;
-}
-
-/* Notifications */
-#notifications {
-  height: 0;
-  text-align: center;
-}
-#header.bottom #notifications {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-}
-.notification {
-  color: #FFF;
-  font-weight: 700;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, .5);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
-  border-radius: 2px;
-  margin: 1px auto;
-  width: 500px;
-  max-width: 100%;
-  position: relative;
-  transition: all .25s ease-in-out;
-}
-.notification.error {
-  background-color: hsla(0, 100%, 38%, .9);
-}
-.notification.warning {
-  background-color: hsla(36, 100%, 38%, .9);
-}
-.notification.info {
-  background-color: hsla(200, 100%, 38%, .9);
-}
-.notification.success {
-  background-color: hsla(104, 100%, 38%, .9);
-}
-.notification a {
-  color: white;
-}
-.notification > .close {
-  padding: 6px;
-  top: 0;
-  right: 0;
-  position: absolute;
-}
-.message {
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  padding: 6px 20px;
-  max-height: 200px;
-  width: 100%;
-  overflow: auto;
-}
-
-/* Settings */
-:root.fourchan-x body {
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-#overlay {
-  background-color: rgba(0, 0, 0, .5);
-  display: -webkit-flex;
-  display: flex;
-  position: fixed;
-  top: 0;
-  left: 0;
-  height: 100%;
-  width: 100%;
-}
-#fourchanx-settings {
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  box-shadow: 0 0 15px rgba(0, 0, 0, .15);
-  height: 600px;
-  max-height: 100%;
-  width: 900px;
-  max-width: 100%;
-  margin: auto;
-  padding: 3px;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-}
-#fourchanx-settings > nav {
-  display: -webkit-flex;
-  display: flex;
-  padding: 2px 2px 0;
-}
-#fourchanx-settings > nav a {
-  text-decoration: underline;
-}
-#fourchanx-settings > nav a.close {
-  text-decoration: none;
-  padding: 2px;
-}
-.sections-list {
-  -webkit-flex: 1;
-  flex: 1;
-}
-.tab-selected {
-  font-weight: 700;
-}
-.section-container {
-  -webkit-flex: 1;
-  flex: 1;
-  position: relative;
-}
-.section-container > section {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  overflow: auto;
-}
-.section-sauce ul,
-.section-rice ul {
-  list-style: none;
-  margin: 0;
-  padding: 8px;
-}
-.section-sauce li,
-.section-rice li {
-  padding-left: 4px;
-}
-.section-main label {
-  text-decoration: underline;
-}
-.section-filter ul,
-.section-qr ul {
-  padding: 0;
-}
-.section-filter li,
-.section-qr li {
-  margin: 10px 40px;
-}
-.section-filter textarea {
-  height: 500px;
-}
-.section-qr textarea {
-  height: 200px;
-}
-.section-sauce textarea {
-  height: 350px;
-}
-.section-rice .field[name="boardnav"] {
-  width: 100%;
-}
-.section-rice textarea {
-  height: 150px;
-}
-.section-archives table {
-  width: 100%;
-}
-.section-archives th:not(:first-child) {
-  width: 30%;
-}
-.section-archives td {
-  text-align: center;
-}
-.section-archives select {
-  width: 90%;
-}
-.section-keybinds .field {
-  font-family: monospace;
-}
-#fourchanx-settings fieldset {
-  border: 1px solid;
-  border-radius: 3px;
-}
-#fourchanx-settings legend {
-  font-weight: 700;
-}
-#fourchanx-settings textarea {
-  font-family: monospace;
-  min-width: 100%;
-  max-width: 100%;
-}
-#fourchanx-settings code {
-  color: #000;
-  background-color: #FFF;
-  padding: 0 2px;
-}
-.unscroll {
-  overflow: hidden;
-}
-
-/* Announcement Hiding */
-:root.hide-announcement #globalMessage,
-:root.hide-announcement-enabled #toggleMsgBtn {
-  display: none;
-}
-a.hide-announcement {
-  float: left;
-}
-
-/* Unread */
-#unread-line {
-  margin: 0;
-}
-
-/* Thread Updater */
-#updater:not(:hover) {
-  background: none;
-  border: none;
-  box-shadow: none;
-}
-#updater > .move {
-  padding: 0 3px;
-}
-#updater > div:last-child {
-  text-align: center;
-}
-#updater input[type=number] {
-  width: 4em;
-}
-#updater:not(:hover) > div:not(.move) {
-  display: none;
-}
-#updater input[type="button"] {
-  width: 100%;
-}
-.new {
-  color: limegreen;
-}
-
-/* Thread Watcher */
-#thread-watcher {
-  max-width: 200px;
-  min-width: 150px;
-  padding: 3px;
-  position: absolute;
-}
-#thread-watcher > div:first-child {
-  display: -webkit-flex;
-  display: flex;
-  -webkit-align-items: center;
-  align-items: center;
-}
-#thread-watcher .move {
-  -webkit-flex: 1;
-  flex: 1;
-}
-#watcher-status:not(:empty)::before {
-  content: "(";
-}
-#watcher-status:not(:empty)::after {
-  content: ")";
-}
-#watched-threads:not(:hover) {
-  max-height: 150px;
-  overflow: hidden;
-}
-#watched-threads div {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-#watched-threads .current {
-  font-weight: 700;
-}
-#watched-threads a {
-  text-decoration: none;
-}
-#watched-threads .dead-thread a[title] {
-  text-decoration: line-through;
-}
-
-/* Thread Stats */
-#thread-stats {
-  background: none;
-  border: none;
-  box-shadow: none;
-}
-
-/* Quote */
-.deadlink {
-  text-decoration: none !important;
-}
-.backlink.deadlink:not(.forwardlink),
-.quotelink.deadlink:not(.forwardlink) {
-  text-decoration: underline !important;
-}
-.inlined {
-  opacity: .5;
-}
-#qp input, .forwarded {
-  display: none;
-}
-.quotelink.forwardlink,
-.backlink.forwardlink {
-  text-decoration: none;
-  border-bottom: 1px dashed;
-}
-.filtered {
-  text-decoration: underline line-through;
-}
-.inline {
-  border: 1px solid;
-  display: table;
-  margin: 2px 0;
-}
-.inline .post {
-  border: 0 !important;
-  background-color: transparent !important;
-  display: table !important;
-  margin: 0 !important;
-  padding: 1px 2px !important;
-}
-#qp > .opContainer::after {
-  content: '';
-  clear: both;
-  display: table;
-}
-#qp .post {
-  border: none;
-  margin: 0;
-  padding: 2px 2px 5px;
-}
-#qp img {
-  max-height: 80vh;
-  max-width: 50vw;
-}
-.qphl {
-  outline: 2px solid rgba(216, 94, 49, .7);
-}
-
-/* File */
-.fileText:hover .fntrunc,
-.fileText:not(:hover) .fnfull,
-.expanded-image > .post > .file > .fileThumb > img[data-md5],
-:not(.expanded-image) > .post > .file > .fileThumb > .full-image {
-  display: none;
-}
-.expanding {
-  opacity: .5;
-}
-.expanded-image {
-  clear: both;
-}
-.expanded-image > .op > .file::after {
-  content: '';
-  clear: both;
-  display: table;
-}
-:root.fit-height .full-image {
-  max-height: 100vh;
-}
-:root.fit-width .full-image {
-  max-width: 100%;
-}
-:root.gecko.fit-width .full-image {
-  width: 100%;
-}
-#ihover {
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  max-height: 100%;
-  max-width: 75%;
-  padding-bottom: 16px;
-}
-
-/* Index/Reply Navigation */
-#navlinks {
-  font-size: 16px;
-  top: 25px;
-  right: 10px;
-}
-
-/* Filter */
-.opContainer.filter-highlight {
-  box-shadow: inset 5px 0 rgba(255, 0, 0, .5);
-}
-.filter-highlight > .reply {
-  box-shadow: -5px 0 rgba(255, 0, 0, .5);
-}
-
-/* Thread & Reply Hiding */
-.hide-thread-button,
-.hide-reply-button {
-  float: left;
-  margin-right: 2px;
-}
-.stub ~ * {
-  display: none !important;
-}
-.stub input {
-  display: inline-block;
-}
-
-/* QR */
-:root.hide-original-post-form #postForm,
-:root.hide-original-post-form .postingMode,
-:root.hide-original-post-form #togglePostForm,
-#qr.autohide:not(.has-focus):not(:hover) > form {
-  display: none;
-}
-#qr select, #dump-button, .remove, .captcha-img {
-  cursor: pointer;
-}
-#qr > div {
-  min-width: 300px;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-align-items: center;
-  align-items: center;
-}
-#qr .move {
-  -webkit-align-self: stretch;
-  align-self: stretch;
-  -webkit-flex: 1;
-  flex: 1;
-}
-#qr select {
-  margin: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  border: none;
-  background: none;
-}
-#qr option {
-  color: #000;
-  background-color: #F7F7F7;
-}
-#qr .close {
-  padding: 0 3px;
-}
-#qr > form {
-  display: -webkit-flex;
-  display: flex;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-}
-.persona {
-  display: -webkit-flex;
-  display: flex;
-}
-.persona .field {
-  -webkit-flex: 1;
-  flex: 1;
-}
-.persona .field:hover,
-.persona .field:focus {
-  -webkit-flex: 3;
-  flex: 3;
-}
-#dump-button {
-  background: linear-gradient(#EEE, #CCC);
-  border: 1px solid #CCC;
-  margin: 0;
-  padding: 2px 4px 3px;
-  outline: none;
-  width: 30px;
-}
-#dump-button:hover,
-#dump-button:focus {
-  background: linear-gradient(#FFF, #DDD);
-}
-#dump-button:active,
-.dump #dump-button:not(:hover):not(:focus) {
-  background: linear-gradient(#CCC, #DDD);
-}
-:root.gecko #dump-button {
-  padding: 0;
-}
-#qr:not(.dump) #dump-list-container {
-  display: none;
-}
-#dump-list-container {
-  height: 100px;
-  position: relative;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-}
-#dump-list {
-  counter-reset: qrpreviews;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  overflow: hidden;
-  position: absolute;
-  white-space: nowrap;
-}
-#dump-list:hover {
-  bottom: -12px;
-  overflow-x: auto;
-  z-index: 1;
-}
-#dump-list::-webkit-scrollbar {
-  height: 12px;
-}
-#dump-list::-webkit-scrollbar-thumb {
-  border: 1px solid;
-}
-.qr-preview {
-  background-position: 50% 20%;
-  background-size: cover;
-  border: 1px solid #808080;
-  color: #FFF !important;
-  font-size: 12px;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  cursor: move;
-  display: inline-block;
-  height: 92px;
-  width: 92px;
-  margin: 4px;
-  padding: 2px;
-  opacity: .6;
-  outline: none;
-  overflow: hidden;
-  position: relative;
-  text-shadow: 0 1px 1px #000;
-  transition: opacity .25s ease-in-out;
-  vertical-align: top;
-  white-space: pre;
-}
-.qr-preview:hover,
-.qr-preview:focus {
-  opacity: .9;
-  color: #FFF !important;
-}
-.qr-preview#selected {
-  opacity: 1;
-}
-.qr-preview::before {
-  counter-increment: qrpreviews;
-  content: counter(qrpreviews);
-  font-weight: 700;
-  text-shadow: 0 0 3px #000, 0 0 5px #000;
-  position: absolute;
-  top: 3px;
-  right: 3px;
-}
-.qr-preview.drag {
-  border-color: red;
-  border-style: dashed;
-}
-.qr-preview.over {
-  border-color: #FFF;
-  border-style: dashed;
-}
-.remove {
-  color: #E00 !important;
-  font-weight: 700;
-  padding: 3px;
-}
-.remove:hover::after {
-  content: ' Remove';
-}
-.qr-preview > label {
-  background: rgba(0, 0, 0, .5);
-  right: 0;
-  bottom: 0;
-  left: 0;
-  position: absolute;
-  text-align: center;
-}
-.qr-preview > label > input {
-  margin: 1px 0;
-  vertical-align: bottom;
-}
-#add-post {
-  display: inline-block;
-  font-size: 30px;
-  height: 30px;
-  width: 30px;
-  line-height: 1;
-  text-align: center;
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  z-index: 1;
-}
-#qr textarea {
-  min-height: 160px;
-  min-width: 100%;
-  display: block;
-}
-#qr.has-captcha textarea {
-  min-height: 120px;
-}
-.textarea {
-  position: relative;
-}
-#char-count {
-  color: #000;
-  background: hsla(0, 0%, 100%, .5);
-  font-size: 8pt;
-  position: absolute;
-  bottom: 1px;
-  right: 1px;
-  pointer-events: none;
-}
-#char-count.warning {
-  color: red;
-}
-.captcha-img {
-  background: #FFF;
-  outline: 1px solid #CCC;
-  outline-offset: -1px;
-}
-.captcha-img > img {
-  display: block;
-  height: 57px;
-  width: 300px;
-}
-#file-n-submit > input {
-  margin: 0;
-}
-#file-n-submit.has-file #qr-no-file {
-  visibility: hidden;
-}
-#file-n-submit:not(.has-file) #qr-filename,
-#file-n-submit:not(.has-file) #qr-file-spoiler,
-#file-n-submit:not(.has-file) #qr-filerm {
-  display: none;
-}
-#file-n-submit {
-  display: -webkit-flex;
-  display: flex;
-  -webkit-flex-direction: row;
-  flex-direction: row;
-  -webkit-align-items: center;
-  align-items: center;
-}
-#qr-no-file, #qr-filename-container {
-  -webkit-flex: 1;
-  flex: 1;
-}
-#qr-filename-container {
-  cursor: default;
-  position: relative;
-  margin-left: 2px;
-}
-#qr-filename {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-}
-#qr-filerm {
-  padding: 0 2px;
-}
-#file-n-submit > #qr-file-spoiler {
-  margin: 0 2px;
-}
-#file-n-submit input[type='submit'] {
-  min-width: 40px;
-  -webkit-order: 1;
-  order: 1;
-}
-
-/* Menu */
-.menu-button {
-  display: inline-block;
-  position: relative;
-}
-.menu-button i {
-  border-top:   6px solid;
-  border-right: 4px solid transparent;
-  border-left:  4px solid transparent;
-  display: inline-block;
-  margin: 2px;
-  vertical-align: middle;
-}
-#menu {
-  border-bottom: 0;
-  display: -webkit-flex;
-  display: flex;
-  margin: 2px 0;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  position: absolute;
-  outline: none;
-}
-#menu.top {
-  top: 100%;
-}
-#menu.bottom {
-  bottom: 100%;
-}
-#menu.left {
-  left: 0;
-}
-#menu.right {
-  right: 0;
-}
-.entry {
-  cursor: pointer;
-  outline: none;
-  padding: 3px 7px;
-  position: relative;
-  text-decoration: none;
-  white-space: nowrap;
-}
-.entry.disabled {
-  color: graytext !important;
-}
-.entry.has-submenu {
-  padding-right: 20px;
-}
-.has-submenu::after {
-  content: '';
-  border-left:   6px solid;
-  border-top:    4px solid transparent;
-  border-bottom: 4px solid transparent;
-  display: inline-block;
-  margin: 4px;
-  position: absolute;
-  right: 3px;
-}
-.has-submenu:not(.focused) > .submenu {
-  display: none;
-}
-.submenu {
-  border-bottom: 0;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  position: absolute;
-  margin: -1px 0;
-}
-.submenu.top {
-  top: 0;
-}
-.submenu.bottom {
-  bottom: 0;
-}
-.submenu.left {
-  left: 100%;
-}
-.submenu.right {
-  right: 100%;
-}
-.entry input {
-  margin: 0;
-}

html/General/Header.html

@@ -1,9 +0,0 @@
-<div id="header-bar" class="dialog">
-  <span id="shortcuts" class="brackets-wrap"></span>
-  <span id="board-list">
-    <span id="custom-board-list"></span>
-    <span id="full-board-list" hidden></span>
-  </span>
-  <div id="toggle-header-bar" title="Toggle the header auto-hiding."></div>
-</div>
-<div id="notifications"></div>

json/archives.json

@@ -1,110 +0,0 @@
-[{
-  "uid": 0,
-  "name": "Foolz",
-  "domain": "archive.foolz.us",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["a", "co", "gd", "jp", "m", "q", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"],
-  "files": ["a", "gd", "jp", "m", "q", "tg", "vg", "vp", "vr", "wsg"]
-}, {
-  "uid": 1,
-  "name": "NSFW Foolz",
-  "domain": "nsfw.foolz.us",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["u"],
-  "files": ["u"]
-}, {
-  "uid": 2,
-  "name": "The Dark Cave",
-  "domain": "archive.thedarkcave.org",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["c", "int", "out", "po"],
-  "files": ["c", "po"]
-}, {
-  "uid": 3,
-  "name": "4plebs",
-  "domain": "archive.4plebs.org",
-  "http": true,
-  "https": false,
-  "software": "foolfuuka",
-  "boards": ["hr", "tg", "tv", "x"],
-  "files": ["hr", "tg", "tv", "x"]
-}, {
-  "uid": 4,
-  "name": "Nyafuu",
-  "domain": "archive.nyafuu.org",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["c", "w", "wg"],
-  "files": ["c", "w", "wg"]
-}, {
-  "uid": 11,
-  "name": "Foolz a Shit",
-  "domain": "archive.foolzashit.com",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["adv", "asp", "cm", "d", "e", "i", "lgbt", "n", "o", "p", "pol", "s", "s4s", "t", "trv", "y"],
-  "files": ["cm", "d", "e", "i", "n", "o", "p", "s", "trv", "y"]
-}, {
-  "uid": 12,
-  "name": "fap archive",
-  "domain": "fuuka.worldathleticproject.org",
-  "http": true,
-  "https": false,
-  "software": "foolfuuka",
-  "boards": ["b", "e", "h", "hc", "p", "s", "u"],
-  "files": ["b", "e", "h", "hc", "p", "s", "u"]
-}, {
-  "uid": 7,
-  "name": "Install Gentoo",
-  "domain": "archive.installgentoo.net",
-  "http": false,
-  "https": true,
-  "software": "fuuka",
-  "boards": ["diy", "g", "sci"],
-  "files": []
-}, {
-  "uid": 8,
-  "name": "Rebecca Black Tech",
-  "domain": "rbt.asia",
-  "http": true,
-  "https": true,
-  "software": "fuuka",
-  "boards": ["cgl", "g", "mu", "w"],
-  "files": ["cgl", "g", "mu", "w"]
-}, {
-  "uid": 9,
-  "name": "Heinessen",
-  "domain": "archive.heinessen.com",
-  "http": true,
-  "https": false,
-  "software": "fuuka",
-  "boards": ["an", "fit", "k", "mlp", "r9k", "toy"],
-  "files": ["an", "fit", "k", "r9k", "toy"]
-}, {
-  "uid": 10,
-  "name": "warosu",
-  "domain": "fuuka.warosu.org",
-  "http": true,
-  "https": true,
-  "software": "fuuka",
-  "boards": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "q", "tg", "vr"],
-  "files": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "q", "tg", "vr"]
-}, {
-  "uid": 13,
-  "name": "Foolz Beta",
-  "domain": "beta.foolz.us",
-  "http": true,
-  "https": true,
-  "withCredentials": true,
-  "software": "foolfuuka",
-  "boards": ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "q", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
-  "files": ["a", "d", "gd", "h", "jp", "m", "q", "tg", "u", "vg", "vp", "vr", "wsg"]
-}]

latest.js

@@ -1 +1 @@
-postMessage({version:'1.2.25'},'*')
+postMessage({version:'1.2.27'},'*')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan-X",
-  "version": "1.2.25",
+  "version": "1.2.27",
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
 
   "meta": {

src/Filtering/PostHiding.coffee

@@ -138,7 +138,7 @@ PostHiding =
   makeButton: (post, type) ->
     a = $.el 'a',
       className: "#{type}-reply-button"
-      innerHTML: "<span class=fourchanx-link>&nbsp;#{if type is 'hide' then '-' else '+'}&nbsp;</span>"
+      innerHTML: "<span class=brackets-wrap>&nbsp;#{if type is 'hide' then '-' else '+'}&nbsp;</span>"
       href:      'javascript:;'
     $.on a, 'click', PostHiding.toggle
     a

src/Filtering/ThreadHiding.coffee

@@ -134,7 +134,7 @@ ThreadHiding =
   makeButton: (thread, type) ->
     a = $.el 'a',
       className: "#{type}-thread-button"
-      innerHTML: "<span class=fourchanx-link>&nbsp;#{if type is 'hide' then '-' else '+'}&nbsp;</span>"
+      innerHTML: "<span class=brackets-wrap>&nbsp;#{if type is 'hide' then '-' else '+'}&nbsp;</span>"
       href:      'javascript:;'
     a.dataset.fullID = thread.fullID
     $.on a, 'click', ThreadHiding.toggle

src/General/Header.coffee

@@ -112,7 +112,7 @@ Header =
       a.className = 'current'
     boardList = $.el 'span',
       id: 'board-list'
-      innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><span class='hide-board-list-container fourchanx-link'><a href=javascript:; class='hide-board-list-button'>&nbsp;-&nbsp;</a></span> #{fourchannav.innerHTML}</span>"
+      innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><span class='hide-board-list-container brackets-wrap'><a href=javascript:; class='hide-board-list-button'>&nbsp;-&nbsp;</a></span> #{fourchannav.innerHTML}</span>"
     fullBoardList = $ '#full-board-list', boardList
     btn = $ '.hide-board-list-button', fullBoardList
     $.on btn, 'click', Header.toggleBoardList
@@ -310,7 +310,7 @@ Header =
 
   addShortcut: (el) ->
     shortcut = $.el 'span',
-      className: 'shortcut fourchanx-link'
+      className: 'shortcut brackets-wrap'
     $.add shortcut, el
     $.prepend Header.shortcuts, shortcut
 

src/General/Main.coffee

@@ -1,18 +1,5 @@
 Main =
   init: ->
-    pathname = location.pathname.split '/'
-    g.BOARD  = new Board pathname[1]
-    return if g.BOARD.ID in ['z', 'fk']
-    g.VIEW   =
-      switch pathname[2]
-        when 'res'
-          'thread'
-        when 'catalog'
-          'catalog'
-        else
-          'index'
-    if g.VIEW is 'thread'
-      g.THREADID = +pathname[3]
 
     # flatten Config into Conf
     # and get saved or default values
@@ -30,7 +17,6 @@ Main =
       Conf[db] = boards: {}
     Conf['selectedArchives'] = {}
     Conf['CachedTitles']     = []
-
     $.get Conf, (items) ->
       $.extend Conf, items
       <% if (type === 'crx') { %>
@@ -52,7 +38,6 @@ Main =
       Main.initStyle
 
   initFeatures: ->
-    Conf
 
     pathname = location.pathname.split '/'
     g.BOARD  = new Board pathname[1]

src/General/Settings.coffee

@@ -22,7 +22,6 @@ Settings =
         $.on d, '4chanXInitFinished', Settings.open
       $.set
         archives: Conf['archives']
-        lastarchivecheck: now
         previousversion: g.VERSION
 
     Settings.addSection 'Main',     Settings.main

src/General/css/burichan.css

@@ -52,7 +52,7 @@
 }
 
 /* Watcher Favicon */
-:root.burichan .watcher-toggler
+:root.burichan .watch-thread-link
 {
   background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(0,0,0)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
 }

src/General/css/futaba.css

@@ -52,7 +52,7 @@
 }
 
 /* Watcher Favicon */
-:root.futaba .watcher-toggler
+:root.futaba .watch-thread-link
 {
   background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(128,0,0)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
 }

src/General/css/photon.css

@@ -52,7 +52,7 @@
 }
 
 /* Watcher Favicon */
-:root.photon .watcher-toggler
+:root.photon .watch-thread-link
 {
   background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(51,51,51)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
 }

src/General/css/style.css

@@ -39,7 +39,7 @@
   overflow: hidden;
 }
 label,
-.watcher-toggler {
+.watch-thread-link {
   cursor: pointer;
 }
 a[href="javascript:;"] {
@@ -227,10 +227,10 @@ a {
   font-weight: bold;
 }
 /* 4chan X link brackets */
-.fourchanx-link::after {
+.brackets-wrap::after {
   content: "]";
 }
-.fourchanx-link::before {
+.brackets-wrap::before {
   content: "[";
 }
 /* Notifications */
@@ -472,12 +472,16 @@ a.hide-announcement {
 }
 #thread-watcher {
   padding-bottom: 3px;
+  padding-left: 3px;
   overflow: hidden;
   white-space: nowrap;
-  min-width: 120px;
+  min-width: 136px;
   max-height: 92%;
   overflow-y: auto;
 }
+#thread-watcher .menu-button {
+  bottom: 1px;
+} 
 :root.fixed-watcher #thread-watcher {
   position: fixed;
 }
@@ -488,7 +492,7 @@ a.hide-announcement {
 #thread-watcher > .move {
   padding-top: 3px;
 }
-#thread-watcher > div {
+#watched-threads > div {
   max-width: 250px;
   overflow: hidden;
   padding-left: 3px;
@@ -504,7 +508,7 @@ a.hide-announcement {
   top: 0px;
   padding: 0px 4px;
 }
-.watcher-toggler {
+.watch-thread-link {
   padding-top: 18px;
   width: 18px;
   height: 0px;
@@ -514,7 +518,7 @@ a.hide-announcement {
   position: relative;
   top: 1px;
 }
-.watcher-toggler.watched {
+.watch-thread-link.watched {
   opacity: 1;
 }
 

src/General/css/tomorrow.css

@@ -58,7 +58,7 @@
 }
 
 /* Watcher Favicon */
-:root.tomorrow .watcher-toggler
+:root.tomorrow .watch-thread-link
 {
   background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(197,200,198)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
 }

src/General/css/yotsuba-b.css

@@ -52,7 +52,7 @@
 }
 
 /* Watcher Favicon */
-:root.yotsuba-b .watcher-toggler
+:root.yotsuba-b .watch-thread-link
 {
   background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(0,0,0)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
 }

src/General/css/yotsuba.css

@@ -52,7 +52,7 @@
 }
 
 /* Watcher Favicon */
-:root.yotsuba .watcher-toggler
+:root.yotsuba .watch-thread-link
 {
   background-image: url("data:image/svg+xml,<svg viewBox='0 0 26 26' preserveAspectRatio='true' xmlns='http://www.w3.org/2000/svg'><path fill='rgb(128,0,0)' d='M24.132,7.971c-2.203-2.205-5.916-2.098-8.25,0.235L15.5,8.588l-0.382-0.382c-2.334-2.333-6.047-2.44-8.25-0.235c-2.204,2.203-2.098,5.916,0.235,8.249l8.396,8.396l8.396-8.396C26.229,13.887,26.336,10.174,24.132,7.971z'/></svg>");
 }

src/General/html/Build/post.html

@@ -34,7 +34,7 @@
 
   <div class='postInfo desktop' id=pi#{postID}>
     <input type=checkbox name=#{postID} value=delete>
-    #{subject}
+    #{subject}&nbsp;
     <span class='nameBlock#{capcodeClass}'>
       #{emailStart}
       <span class=name>#{name or ''}</span>

src/General/html/Monitoring/ThreadWatcher.html

@@ -1,5 +1,2 @@
-<div>
+<div class="move">Thread Watcher <span id="watcher-status"></span><a class="menu-button brackets-wrap" href="javascript:;"><i></i></a><a class=close href=javascript:;>×</a></span></div>
-  <span class="move">Thread Watcher <span id="watcher-status"></span><a class=close href=javascript:;>×</a></span>
-  <a class="menu-button" href="javascript:;">[<i></i>]</a>
-</div>
 <div id="watched-threads"></div>