From 9329c7ce6ec21aec1ac1195348ec66f14c2dbaac Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 14 Sep 2012 19:53:59 +0200 Subject: [PATCH 01/16] Close #753. --- 4chan_x.user.js | 12 ++++++++++-- script.coffee | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index c3eec1885..8238b7acb 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -402,11 +402,19 @@ } }, addStyle: function(css) { - var style; + var f, style; style = $.el('style', { textContent: css }); - $.add(d.head || d.documentElement, style); + f = function() { + var root; + if (root = d.head || d.documentElement) { + return $.add(root, style); + } else { + return setTimeout(f, 20); + } + }; + f(); return style; }, x: function(path, root) { diff --git a/script.coffee b/script.coffee index 2e6a74815..522ff0783 100644 --- a/script.coffee +++ b/script.coffee @@ -315,8 +315,16 @@ $.extend $, addStyle: (css) -> style = $.el 'style', textContent: css - # XXX Only Chrome has no d.head on document-start. - $.add d.head or d.documentElement, style + # That's terrible. + # XXX tmp fix for scriptish: + # https://github.com/scriptish/scriptish/issues/16 + f = -> + # XXX Only Chrome has no d.head on document-start. + if root = d.head or d.documentElement + $.add root, style + else + setTimeout f, 20 + f() style x: (path, root=d.body) -> # XPathResult.ANY_UNORDERED_NODE_TYPE is 8 From 08ef04697d0d49a306161d5fa83f0000462b3df4 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 14 Sep 2012 20:52:22 +0200 Subject: [PATCH 02/16] Fix quote number href in builder. --- 4chan_x.user.js | 2 +- script.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 8238b7acb..055978a46 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3840,7 +3840,7 @@ container = $.el('div', { id: "pc" + postID, className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", - innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + (name || '') + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject) + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + subject + " ") + ("") + emailStart + ("" + (name || '') + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + (comment || '') + "
") + '
' + innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + (name || '') + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject) + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + subject + " ") + ("") + emailStart + ("" + (name || '') + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + (comment || '') + "
") + '
' }); _ref = $$('.quotelink', container); for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/script.coffee b/script.coffee index 522ff0783..95435ce92 100644 --- a/script.coffee +++ b/script.coffee @@ -3147,7 +3147,7 @@ Build = "" + "No." + " + return if -1 isnt d.cookie.indexOf 'pass_enabled=' return unless QR.captchaIsEnabled = !!$.id 'captchaFormPart' if $.id 'recaptcha_challenge_field_holder' @ready() From d063d89ed97f7a9f7a517885e3065d1ad237a361 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 18 Sep 2012 18:15:14 +0200 Subject: [PATCH 04/16] Add 'Enter' in keybind combinations. --- 4chan_x.user.js | 2 ++ changelog | 1 + script.coffee | 2 ++ 3 files changed, 5 insertions(+) diff --git a/4chan_x.user.js b/4chan_x.user.js index d7772d312..d1e39bf0b 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1504,6 +1504,8 @@ switch (kc = e.keyCode) { case 8: return ''; + case 13: + return 'Enter'; case 27: return 'Esc'; case 37: diff --git a/changelog b/changelog index e43e2e54d..0bdf8b1d2 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ master - Mayhem Add support for 4chan Pass. + You can now use 'Enter' in keybind combinations. 2.35.0 - Mayhem diff --git a/script.coffee b/script.coffee index df8b74955..8eac9cb07 100644 --- a/script.coffee +++ b/script.coffee @@ -1183,6 +1183,8 @@ Keybinds = key = switch kc = e.keyCode when 8 '' + when 13 + 'Enter' when 27 'Esc' when 37 From 9d6232ec53e2fb65e5a81471fedbb817fdc5bdac Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 18 Sep 2012 18:39:48 +0200 Subject: [PATCH 05/16] Some qr.captchaIsEnabled here and there. --- 4chan_x.user.js | 4 ++-- script.coffee | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index d1e39bf0b..905dcffbd 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1803,7 +1803,7 @@ $.add(el, err); } QR.open(); - if (/captcha|verification/i.test(el.textContent)) { + if (qr.captchaIsEnabled && /captcha|verification/i.test(el.textContent)) { $('[autocomplete]', QR.el).focus(); } if (d.hidden || d.oHidden || d.mozHidden || d.webkitHidden) { @@ -2511,7 +2511,7 @@ } if (err) { if (/captcha|verification/i.test(err.textContent) || err === 'Connection error with sys.4chan.org.') { - QR.cooldown.auto = !!$.get('captchas', []).length; + QR.cooldown.auto = qr.captchaIsEnabled ? !!$.get('captchas', []).length : true; QR.cooldown.set(2); } else { QR.cooldown.auto = false; diff --git a/script.coffee b/script.coffee index 8eac9cb07..0804e4f1c 100644 --- a/script.coffee +++ b/script.coffee @@ -1392,7 +1392,7 @@ QR = el.innerHTML = null $.add el, err QR.open() - if /captcha|verification/i.test el.textContent + if qr.captchaIsEnabled and /captcha|verification/i.test el.textContent # Focus the captcha input on captcha error. $('[autocomplete]', QR.el).focus() alert el.textContent if d.hidden or d.oHidden or d.mozHidden or d.webkitHidden @@ -1956,7 +1956,7 @@ QR = if err if /captcha|verification/i.test(err.textContent) or err is 'Connection error with sys.4chan.org.' # Enable auto-post if we have some cached captchas. - QR.cooldown.auto = !!$.get('captchas', []).length + QR.cooldown.auto = if qr.captchaIsEnabled then !!$.get('captchas', []).length else true # Too many frequent mistyped captchas will auto-ban you! # On connection error, the post most likely didn't go through. QR.cooldown.set 2 From b6f3466624818b1e4fbafceb7b23d0e37230564a Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 18 Sep 2012 18:42:19 +0200 Subject: [PATCH 06/16] nvm --- 4chan_x.user.js | 2 +- script.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 905dcffbd..de80a6860 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2511,7 +2511,7 @@ } if (err) { if (/captcha|verification/i.test(err.textContent) || err === 'Connection error with sys.4chan.org.') { - QR.cooldown.auto = qr.captchaIsEnabled ? !!$.get('captchas', []).length : true; + QR.cooldown.auto = !!$.get('captchas', []).length; QR.cooldown.set(2); } else { QR.cooldown.auto = false; diff --git a/script.coffee b/script.coffee index 0804e4f1c..cca7b666c 100644 --- a/script.coffee +++ b/script.coffee @@ -1956,7 +1956,7 @@ QR = if err if /captcha|verification/i.test(err.textContent) or err is 'Connection error with sys.4chan.org.' # Enable auto-post if we have some cached captchas. - QR.cooldown.auto = if qr.captchaIsEnabled then !!$.get('captchas', []).length else true + QR.cooldown.auto = !!$.get('captchas', []).length # Too many frequent mistyped captchas will auto-ban you! # On connection error, the post most likely didn't go through. QR.cooldown.set 2 From dda4b91448ae821b506f15a73a8340944ebd404f Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 18 Sep 2012 18:44:56 +0200 Subject: [PATCH 07/16] qr -> QR --- 4chan_x.user.js | 2 +- script.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index de80a6860..95e71a5a0 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1803,7 +1803,7 @@ $.add(el, err); } QR.open(); - if (qr.captchaIsEnabled && /captcha|verification/i.test(el.textContent)) { + if (QR.captchaIsEnabled && /captcha|verification/i.test(el.textContent)) { $('[autocomplete]', QR.el).focus(); } if (d.hidden || d.oHidden || d.mozHidden || d.webkitHidden) { diff --git a/script.coffee b/script.coffee index cca7b666c..28d27b14e 100644 --- a/script.coffee +++ b/script.coffee @@ -1392,7 +1392,7 @@ QR = el.innerHTML = null $.add el, err QR.open() - if qr.captchaIsEnabled and /captcha|verification/i.test el.textContent + if QR.captchaIsEnabled and /captcha|verification/i.test el.textContent # Focus the captcha input on captcha error. $('[autocomplete]', QR.el).focus() alert el.textContent if d.hidden or d.oHidden or d.mozHidden or d.webkitHidden From f474d49c38b99ef68efc953901eaa600b73b12be Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 18 Sep 2012 19:50:23 +0200 Subject: [PATCH 08/16] Release 2.35.1. --- 4chan_x.user.js | 6 +++--- Cakefile | 2 +- changelog | 2 ++ latest.js | 2 +- script.coffee | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 95e71a5a0..4c5179b44 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan x -// @version 2.35.0 +// @version 2.35.1 // @namespace aeosynth // @description Adds various features. // @copyright 2009-2011 James Campos @@ -27,7 +27,7 @@ * Copyright (c) 2009-2011 James Campos * Copyright (c) 2012 Nicolas Stepien * http://mayhemydg.github.com/4chan-x/ - * 4chan X 2.35.0 + * 4chan X 2.35.1 * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -5356,7 +5356,7 @@ return $.globalEval(("(" + code + ")()").replace('_id_', bq.id)); }, namespace: '4chan_x.', - version: '2.35.0', + version: '2.35.1', callbacks: [], css: '\ /* dialog styling */\ diff --git a/Cakefile b/Cakefile index 87bbe497e..35a2adc39 100644 --- a/Cakefile +++ b/Cakefile @@ -2,7 +2,7 @@ {exec} = require 'child_process' fs = require 'fs' -VERSION = '2.35.0' +VERSION = '2.35.1' HEADER = """ // ==UserScript== diff --git a/changelog b/changelog index 0bdf8b1d2..544df79e8 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master + +2.35.1 - Mayhem Add support for 4chan Pass. You can now use 'Enter' in keybind combinations. diff --git a/latest.js b/latest.js index 48fe59683..bb6fac5a9 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.35.0'},'*') \ No newline at end of file +postMessage({version:'2.35.1'},'*') \ No newline at end of file diff --git a/script.coffee b/script.coffee index 28d27b14e..eac00f189 100644 --- a/script.coffee +++ b/script.coffee @@ -4283,7 +4283,7 @@ Main = $.globalEval "(#{code})()".replace '_id_', bq.id namespace: '4chan_x.' - version: '2.35.0' + version: '2.35.1' callbacks: [] css: ' /* dialog styling */ From 262b34257ef1cebe1a0373783df4dc84bc3a6966 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 18 Sep 2012 20:36:04 +0200 Subject: [PATCH 09/16] notice --- changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog b/changelog index 544df79e8..c5a00642d 100644 --- a/changelog +++ b/changelog @@ -4,6 +4,8 @@ master - Mayhem Add support for 4chan Pass. You can now use 'Enter' in keybind combinations. + !!! This is not working on Firefox because of Greasemonkey/Scriptish limitations, see + https://github.com/greasemonkey/greasemonkey/issues/1630 2.35.0 - Mayhem From b809fd97ab70a78c63af5e71e9690d90d6872d97 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 18 Sep 2012 20:55:19 +0200 Subject: [PATCH 10/16] fix 4chan pass on fx --- 4chan_x.user.js | 3 +++ changelog | 4 ++-- script.coffee | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 4c5179b44..93548709c 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -357,6 +357,9 @@ } $.extend(r, callbacks); $.extend(r.upload, upCallbacks); + if (type === 'post') { + r.withCredentials = true; + } r.send(form); return r; }, diff --git a/changelog b/changelog index c5a00642d..706540354 100644 --- a/changelog +++ b/changelog @@ -1,11 +1,11 @@ master +- Mayhem + Fix 4chan Pass with QR on Firefox. 2.35.1 - Mayhem Add support for 4chan Pass. You can now use 'Enter' in keybind combinations. - !!! This is not working on Firefox because of Greasemonkey/Scriptish limitations, see - https://github.com/greasemonkey/greasemonkey/issues/1630 2.35.0 - Mayhem diff --git a/script.coffee b/script.coffee index eac00f189..77295ce64 100644 --- a/script.coffee +++ b/script.coffee @@ -290,6 +290,7 @@ $.extend $, r.setRequestHeader key, val $.extend r, callbacks $.extend r.upload, upCallbacks + r.withCredentials = true if type is 'post' r.send form r cache: (url, cb) -> From e451696b3c605dd1eae6930cef47cdc75bba5f8c Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 18 Sep 2012 20:55:30 +0200 Subject: [PATCH 11/16] Release 2.35.2. --- 4chan_x.user.js | 6 +++--- Cakefile | 2 +- changelog | 2 ++ latest.js | 2 +- script.coffee | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 93548709c..69b00c320 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan x -// @version 2.35.1 +// @version 2.35.2 // @namespace aeosynth // @description Adds various features. // @copyright 2009-2011 James Campos @@ -27,7 +27,7 @@ * Copyright (c) 2009-2011 James Campos * Copyright (c) 2012 Nicolas Stepien * http://mayhemydg.github.com/4chan-x/ - * 4chan X 2.35.1 + * 4chan X 2.35.2 * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -5359,7 +5359,7 @@ return $.globalEval(("(" + code + ")()").replace('_id_', bq.id)); }, namespace: '4chan_x.', - version: '2.35.1', + version: '2.35.2', callbacks: [], css: '\ /* dialog styling */\ diff --git a/Cakefile b/Cakefile index 35a2adc39..0ee1e6870 100644 --- a/Cakefile +++ b/Cakefile @@ -2,7 +2,7 @@ {exec} = require 'child_process' fs = require 'fs' -VERSION = '2.35.1' +VERSION = '2.35.2' HEADER = """ // ==UserScript== diff --git a/changelog b/changelog index 706540354..2027ecc4b 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master + +2.35.2 - Mayhem Fix 4chan Pass with QR on Firefox. diff --git a/latest.js b/latest.js index bb6fac5a9..bc5e8367c 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.35.1'},'*') \ No newline at end of file +postMessage({version:'2.35.2'},'*') \ No newline at end of file diff --git a/script.coffee b/script.coffee index 77295ce64..07215f8f4 100644 --- a/script.coffee +++ b/script.coffee @@ -4284,7 +4284,7 @@ Main = $.globalEval "(#{code})()".replace '_id_', bq.id namespace: '4chan_x.' - version: '2.35.1' + version: '2.35.2' callbacks: [] css: ' /* dialog styling */ From 673a3e08d2ac2eea44b13aee3d41a4a5571be9cd Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Wed, 19 Sep 2012 03:48:08 +0200 Subject: [PATCH 12/16] Don't reset all of 4chan's settings, just disable it. --- 4chan_x.user.js | 6 ++++-- script.coffee | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 69b00c320..55029e307 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -5003,7 +5003,7 @@ Main = { init: function() { - var cutoff, hiddenThreads, id, key, now, path, pathname, temp, timestamp, val, _ref; + var cutoff, hiddenThreads, id, key, now, path, pathname, settings, temp, timestamp, val, _ref; Main.flatten(null, Config); path = location.pathname; pathname = path.slice(1).split('/'); @@ -5054,7 +5054,9 @@ return; } if (Conf['Disable 4chan\'s extension']) { - localStorage.setItem('4chan-settings', '{"disableAll":true}'); + settings = JSON.parse(localStorage.getItem('4chan-settings')) || {}; + settings.disableAll = true; + localStorage.setItem('4chan-settings', JSON.stringify(settings)); } Options.init(); if (Conf['Quick Reply'] && Conf['Hide Original Post Form']) { diff --git a/script.coffee b/script.coffee index 07215f8f4..48d0a0a33 100644 --- a/script.coffee +++ b/script.coffee @@ -4037,7 +4037,9 @@ Main = return if Conf['Disable 4chan\'s extension'] - localStorage.setItem '4chan-settings', '{"disableAll":true}' + settings = JSON.parse(localStorage.getItem '4chan-settings') or {} + settings.disableAll = true + localStorage.setItem '4chan-settings', JSON.stringify settings Options.init() From 55da34c842924b2d9323ad418dea1b227b1ba15f Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Thu, 20 Sep 2012 01:11:25 +0200 Subject: [PATCH 13/16] Fix #754 --- 4chan_x.user.js | 14 +++++++++++--- script.coffee | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 55029e307..4504b384d 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -5805,7 +5805,7 @@ body.unscroll {\ max-width: 500px;\ }\ .qphl {\ - outline: 2px solid rgba(216, 94, 49, .7);\ + box-shadow: 0 0 0 2px rgba(216, 94, 49, .7);\ }\ .quotelink.deadlink {\ text-decoration: underline !important;\ @@ -5833,10 +5833,18 @@ div.opContainer {\ display: block !important;\ }\ .opContainer.filter_highlight {\ - box-shadow: inset 5px 0 rgba(255,0,0,0.5);\ + box-shadow: inset 5px 0 rgba(255, 0, 0, .5);\ +}\ +.opContainer.filter_highlight.qphl {\ + box-shadow: inset 5px 0 rgba(255, 0, 0, .5),\ + 0 0 0 2px rgba(216, 94, 49, .7);\ }\ .filter_highlight > .reply {\ - box-shadow: -5px 0 rgba(255,0,0,0.5);\ + box-shadow: -5px 0 rgba(255, 0, 0, .5);\ +}\ +.filter_highlight > .reply.qphl {\ + box-shadow: -5px 0 rgba(255, 0, 0, .5),\ + 0 0 0 2px rgba(216, 94, 49, .7)\ }\ .filtered {\ text-decoration: underline line-through;\ diff --git a/script.coffee b/script.coffee index 48d0a0a33..0e4519d1e 100644 --- a/script.coffee +++ b/script.coffee @@ -4730,7 +4730,7 @@ body.unscroll { max-width: 500px; } .qphl { - outline: 2px solid rgba(216, 94, 49, .7); + box-shadow: 0 0 0 2px rgba(216, 94, 49, .7); } .quotelink.deadlink { text-decoration: underline !important; @@ -4758,10 +4758,18 @@ div.opContainer { display: block !important; } .opContainer.filter_highlight { - box-shadow: inset 5px 0 rgba(255,0,0,0.5); + box-shadow: inset 5px 0 rgba(255, 0, 0, .5); +} +.opContainer.filter_highlight.qphl { + box-shadow: inset 5px 0 rgba(255, 0, 0, .5), + 0 0 0 2px rgba(216, 94, 49, .7); } .filter_highlight > .reply { - box-shadow: -5px 0 rgba(255,0,0,0.5); + box-shadow: -5px 0 rgba(255, 0, 0, .5); +} +.filter_highlight > .reply.qphl { + box-shadow: -5px 0 rgba(255, 0, 0, .5), + 0 0 0 2px rgba(216, 94, 49, .7) } .filtered { text-decoration: underline line-through; From 11c7d5316fe4f5a86d0e43257acae013d4b6c966 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Thu, 20 Sep 2012 01:31:37 +0200 Subject: [PATCH 14/16] Close #767 --- 4chan_x.user.js | 6 +++++- changelog | 2 ++ script.coffee | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 4504b384d..7f2ee0928 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2201,6 +2201,7 @@ } else { return; } + $.addClass(QR.el, 'captcha'); $.after($('.textarea', QR.el), $.el('div', { className: 'captchaimg', title: 'Reload', @@ -5619,9 +5620,12 @@ h1 {\ }\ #qr textarea.field {\ display: -webkit-box;\ - min-height: 120px;\ + min-height: 160px;\ min-width: 100%;\ }\ +#qr.captcha textarea.field {\ + min-height: 120px;\ +}\ .textarea {\ position: relative;\ }\ diff --git a/changelog b/changelog index 2027ecc4b..ffcaa7998 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master +- Mayhem + Larger Comment text input by default for 4chan Pass users and on /f/ (no captcha). 2.35.2 - Mayhem diff --git a/script.coffee b/script.coffee index 0e4519d1e..233088cf6 100644 --- a/script.coffee +++ b/script.coffee @@ -1688,6 +1688,7 @@ QR = delete @onready else return + $.addClass QR.el, 'captcha' $.after $('.textarea', QR.el), $.el 'div', className: 'captchaimg' title: 'Reload' @@ -4544,9 +4545,12 @@ h1 { } #qr textarea.field { display: -webkit-box; - min-height: 120px; + min-height: 160px; min-width: 100%; } +#qr.captcha textarea.field { + min-height: 120px; +} .textarea { position: relative; } From 38157fed6676a3c0b2d550ce64fb4817a7148961 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Thu, 20 Sep 2012 01:38:00 +0200 Subject: [PATCH 15/16] Replace the character counter. Close #768. --- 4chan_x.user.js | 5 ++++- script.coffee | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 7f2ee0928..a5968007f 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -5632,9 +5632,12 @@ h1 {\ #charCount {\ color: #000;\ background: hsla(0, 0%, 100%, .5);\ + font-size: 8pt;\ + margin: 1px;\ position: absolute;\ - top: 100%;\ + bottom: 0;\ right: 0;\ + pointer-events: none;\ }\ #charCount.warning {\ color: red;\ diff --git a/script.coffee b/script.coffee index 233088cf6..c5612ea70 100644 --- a/script.coffee +++ b/script.coffee @@ -4557,9 +4557,12 @@ h1 { #charCount { color: #000; background: hsla(0, 0%, 100%, .5); + font-size: 8pt; + margin: 1px; position: absolute; - top: 100%; + bottom: 0; right: 0; + pointer-events: none; } #charCount.warning { color: red; From ad4bc27f472603f4261855abe4b11bf52652ecd3 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Thu, 20 Sep 2012 23:48:40 +0200 Subject: [PATCH 16/16] Release 2.35.3. --- 4chan_x.user.js | 6 +++--- Cakefile | 2 +- changelog | 2 ++ latest.js | 2 +- script.coffee | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index a5968007f..066b51e63 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan x -// @version 2.35.2 +// @version 2.35.3 // @namespace aeosynth // @description Adds various features. // @copyright 2009-2011 James Campos @@ -27,7 +27,7 @@ * Copyright (c) 2009-2011 James Campos * Copyright (c) 2012 Nicolas Stepien * http://mayhemydg.github.com/4chan-x/ - * 4chan X 2.35.2 + * 4chan X 2.35.3 * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -5362,7 +5362,7 @@ return $.globalEval(("(" + code + ")()").replace('_id_', bq.id)); }, namespace: '4chan_x.', - version: '2.35.2', + version: '2.35.3', callbacks: [], css: '\ /* dialog styling */\ diff --git a/Cakefile b/Cakefile index 0ee1e6870..41b51d179 100644 --- a/Cakefile +++ b/Cakefile @@ -2,7 +2,7 @@ {exec} = require 'child_process' fs = require 'fs' -VERSION = '2.35.2' +VERSION = '2.35.3' HEADER = """ // ==UserScript== diff --git a/changelog b/changelog index ffcaa7998..472e7fb3e 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master + +2.35.3 - Mayhem Larger Comment text input by default for 4chan Pass users and on /f/ (no captcha). diff --git a/latest.js b/latest.js index bc5e8367c..72c0783fb 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.35.2'},'*') \ No newline at end of file +postMessage({version:'2.35.3'},'*') \ No newline at end of file diff --git a/script.coffee b/script.coffee index c5612ea70..a08ba0713 100644 --- a/script.coffee +++ b/script.coffee @@ -4287,7 +4287,7 @@ Main = $.globalEval "(#{code})()".replace '_id_', bq.id namespace: '4chan_x.' - version: '2.35.2' + version: '2.35.3' callbacks: [] css: ' /* dialog styling */