From 30e0776c0e4471e946ac84d86371be8ef62b63e8 Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Tue, 21 Feb 2012 03:12:24 -0600 Subject: [PATCH 01/11] span.filesize formatting. --- 4chan_x.user.js | 141 ++++++++++++++++++++++++++++++++++++++++++++++-- script.coffee | 104 ++++++++++++++++++++++++++++++++++- 2 files changed, 240 insertions(+), 5 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 319323e16..070657042 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -72,7 +72,7 @@ */ (function() { - var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, SECOND, Time, VERSION, anonymize, conf, config, d, engine, expandComment, expandThread, filter, flatten, g, getTitle, imgExpand, imgGif, imgHover, key, keybinds, log, nav, options, qr, quoteBacklink, quoteIndicators, quoteInline, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, strikethroughQuotes, threadHiding, threadStats, threading, titlePost, ui, unread, unxify, updater, val, watcher, _base; + var $, $$, DAY, Favicon, Filesize, HOUR, MINUTE, Main, NAMESPACE, SECOND, Time, VERSION, anonymize, conf, config, d, engine, expandComment, expandThread, filter, flatten, g, getTitle, imgExpand, imgGif, imgHover, key, keybinds, log, nav, options, qr, quoteBacklink, quoteIndicators, quoteInline, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, strikethroughQuotes, threadHiding, threadStats, threading, titlePost, ui, unread, unxify, updater, val, watcher, _base; config = { main: { @@ -81,6 +81,7 @@ 'Fix XXX\'d Post Numbers': [true, 'Replace XXX\'d post numbers with their actual number'], 'Keybinds': [true, 'Binds actions to keys'], 'Time Formatting': [true, 'Arbitrarily formatted timestamps, using your local time'], + 'Filesize Formatting': [true, 'Reformats the image information'], 'Report Button': [true, 'Add report buttons'], 'Comment Expansion': [true, 'Expand too long comments'], 'Thread Expansion': [true, 'View all replies'], @@ -148,6 +149,8 @@ sauces: ['http://iqdb.org/?url=$1', 'http://www.google.com/searchbyimage?image_url=$1', '#http://tineye.com/search?url=$1', '#http://saucenao.com/search.php?db=999&url=$1', '#http://3d.iqdb.org/?url=$1', '#http://regex.info/exif.cgi?imgurl=$2', '# uploaders:', '#http://imgur.com/upload?url=$2', '#http://omploader.org/upload?url1=$2', '# "View Same" in archives:', '#http://archive.foolz.us/a/image/$3/', '#http://archive.installgentoo.net/g/image/$3'].join('\n'), time: '%m/%d/%y(%a)%H:%M', backlink: '>>%id', + filesizeR: '%l (%s, %wx%h, %n)', + filesizeT: '%l (%s, %wx%h)', favicon: 'ferongr', hotkeys: { openOptions: ['ctrl+o', 'Open Options'], @@ -2076,7 +2079,7 @@ } }, dialog: function() { - var arr, back, checked, description, dialog, favicon, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, ta, time, tr, ul, _i, _j, _len, _len2, _ref, _ref2, _ref3, _ref4; + var arr, back, checked, description, dialog, favicon, filesizeR, filesizeT, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, ta, time, tr, ul, _i, _j, _len, _len2, _ref, _ref2, _ref3, _ref4; dialog = $.el('div', { id: 'options', className: 'reply dialog', @@ -2141,6 +2144,18 @@
  • Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P
    • \
  • Minutes: %M
    • \ \ +
    Filesize Formatting is disabled.
    \ + \
    Unread Favicon is disabled.
    \ Unread favicons
    \ : + Thread Filesize formatting +
  • :
    • +
  • Link: %l (lowercase L)
    • +
  • Size: %B (Bytes), %K (KB), %M (MB), %s (simplified unit)
    • +
  • Width: %w
    • +
  • Height: %h
    • +
  • Original filename: %n (Reply only)
    • +
    Unread Favicon is disabled.
    Unread favicons

    \

    Filename:

    \

    Image dimensions:

    \ -

    Filesize:

    \ +

    FileFormat:

    \

    Image MD5:

    \ \ \ @@ -2144,16 +2144,15 @@
  • Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P
    • \
  • Minutes: %M
    • \ \ -
    Filesize Formatting is disabled.
    \ +
    File Info Formatting is disabled.
    \ \
    Unread Favicon is disabled.
    \ @@ -2209,16 +2208,16 @@ } (back = $('[name=backlink]', dialog)).value = conf['backlink']; (time = $('[name=time]', dialog)).value = conf['time']; - (filesizeR = $('[name=filesizeR]', dialog)).value = conf['filesizeR']; - (filesizeT = $('[name=filesizeT]', dialog)).value = conf['filesizeT']; + (fileFormatR = $('[name=fileFormatR]', dialog)).value = conf['fileFormatR']; + (fileFormatT = $('[name=fileFormatT]', dialog)).value = conf['fileFormatT']; $.on(back, 'keyup', $.cb.value); $.on(back, 'keyup', options.backlink); $.on(time, 'keyup', $.cb.value); $.on(time, 'keyup', options.time); - $.on(filesizeR, 'keyup', $.cb.value); - $.on(filesizeR, 'keyup', options.filesize); - $.on(filesizeT, 'keyup', $.cb.value); - $.on(filesizeT, 'keyup', options.filesize); + $.on(fileFormatR, 'keyup', $.cb.value); + $.on(fileFormatR, 'keyup', options.fileFormat); + $.on(fileFormatT, 'keyup', $.cb.value); + $.on(fileFormatT, 'keyup', options.fileFormat); favicon = $('select', dialog); favicon.value = conf['favicon']; $.on(favicon, 'change', $.cb.value); @@ -2257,8 +2256,8 @@ d.body.style.setProperty('overflow', 'hidden', null); options.backlink.call(back); options.time.call(time); - options.filesize.call(filesizeR); - options.filesize.call(filesizeT); + options.fileFormat.call(fileFormatR); + options.fileFormat.call(fileFormatT); return options.favicon.call(favicon); }, close: function() { @@ -2287,18 +2286,15 @@ backlink: function() { return $.id('backlinkPreview').textContent = conf['backlink'].replace(/%id/, '123456789'); }, - filesize: function() { - Filesize.fstype = this.name === 'filesizeR' ? 0 : 1; - Filesize.getFormat(); - Filesize.data = { + fileFormat: function() { + FileFormat.data = { link: '1329791824.png', size: 996, unit: 'KB', - width: 1366, - height: 768 + resolution: '1366x768', + filename: 'Untitled.png' }; - if (Filesize.fstype === 0) Filesize.data.filename = 'Untitled.png'; - return $.id("" + this.name + "Preview").innerHTML = Filesize.funk(Filesize); + return $.id("" + this.name + "Preview").innerHTML = FileFormat.funks[this.name === 'fileFormatR' ? 0 : 1](FileFormat); }, favicon: function() { Favicon["switch"](); @@ -2893,51 +2889,52 @@ } }; - Filesize = { + FileFormat = { init: function() { - Filesize.fstype = g.REPLY ? 0 : 1; - Filesize.fsconf = ['filesizeR', 'filesizeT']; - Filesize.regEx = [/File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+)x(\d+),\s/, /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+)x(\d+)\)/]; + if (g.BOARD === 'f') return; + FileFormat.ffConf = ['fileFormatR', 'fileFormatT']; + FileFormat.ffMtrs = [/%([BKlMnrs])/g, /%([BKlMrs])/g]; + FileFormat.ffRgex = [/File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s/, /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/]; this.parse = function(node) { - var filename, height, link, size, unit, width, _, _ref; - _ref = node.innerHTML.match(Filesize.regEx[Filesize.fstype]), _ = _ref[0], link = _ref[1], size = _ref[2], unit = _ref[3], width = _ref[4], height = _ref[5], filename = _ref[6]; + var filename, link, resolution, size, unit, _, _ref; + FileFormat.ffType = node.childNodes.length > 3 ? 0 : 1; + _ref = node.innerHTML.match(FileFormat.ffRgex[FileFormat.ffType]), _ = _ref[0], link = _ref[1], size = _ref[2], unit = _ref[3], resolution = _ref[4], filename = _ref[5]; return { - 'link': link, - 'size': size, - 'unit': unit, - 'width': width, - 'height': height, - 'filename': filename + link: link, + size: size, + unit: unit, + resolution: resolution, + filename: filename }; }; - Filesize.getFormat(); + FileFormat.funks = FileFormat.setFormats(); return g.callbacks.push(this.node); }, node: function(root) { - var filesize, node; + var node; if (root.className === 'inline' || !(node = $('.filesize', root))) return; - Filesize.data = Filesize.parse(node); - filesize = $.el('span', { - className: 'filesize', - innerHTML: Filesize.funk(Filesize) + ' ' - }); - return $.replace(node, filesize); + FileFormat.data = FileFormat.parse(node); + return node.innerHTML = FileFormat.funks[FileFormat.ffType](FileFormat) + ' '; }, - getFormat: function() { - var code; - code = conf[Filesize.fsconf[Filesize.fstype]].replace(/%([BhKlMnsw])/g, function(s, c) { - if (c in Filesize.formatters) { - return "' + Filesize.formatters." + c + "() + '"; - } else { - return s; - } - }); - return Filesize.funk = Function('Filesize', "return '" + code + "'"); + setFormats: function() { + var code, i, _results; + _results = []; + for (i = 0; i <= 1; i++) { + code = conf[FileFormat.ffConf[i]].replace(FileFormat.ffMtrs[i], function(s, c) { + if (c in FileFormat.formatters) { + return "' + FileFormat.formatters." + c + "() + '"; + } else { + return s; + } + }); + _results.push(Function('FileFormat', "return '" + code + "'")); + } + return _results; }, convertUnit: function(unitT) { var i, size, unitF, units; - size = Filesize.data.size; - unitF = Filesize.data.unit; + size = FileFormat.data.size; + unitF = FileFormat.data.unit; if (unitF !== unitT) { units = ['B', 'KB', 'MB']; i = units.indexOf(unitF) - units.indexOf(unitT); @@ -2959,32 +2956,30 @@ }, formatters: { B: function() { - return Filesize.convertUnit('B'); - }, - h: function() { - return Filesize.data.height; + return FileFormat.convertUnit('B'); }, K: function() { - return Filesize.convertUnit('KB'); + return FileFormat.convertUnit('KB'); }, l: function() { - return Filesize.data.link; + return FileFormat.data.link; }, M: function() { - return Filesize.convertUnit('MB'); + return FileFormat.convertUnit('MB'); }, n: function() { - if (Filesize.fstype === 0) { - return Filesize.data.filename; + var ext; + if ((ext = FileFormat.data.filename.lastIndexOf('.')) > 38) { + return '' + FileFormat.data.filename + '' + FileFormat.data.filename.substr(0, 32) + ' (...)' + FileFormat.data.filename.substr(ext) + ''; } else { - return '%n'; + return FileFormat.data.filename; } }, - s: function() { - return "" + Filesize.data.size + " " + Filesize.data.unit; + r: function() { + return FileFormat.data.resolution; }, - w: function() { - return Filesize.data.width; + s: function() { + return "" + FileFormat.data.size + " " + FileFormat.data.unit; } } }; @@ -3253,8 +3248,8 @@ qp.innerHTML = html; if (conf['Image Auto-Gif']) imgGif.node(qp); if (conf['Time Formatting']) Time.node(qp); - if (conf['Filesize Formatting']) { - if (id !== threadID) return Filesize.node(qp); + if (conf['File Info Formatting']) { + if (id !== threadID) return FileFormat.node(qp); } } }; @@ -3748,7 +3743,7 @@ if (conf['Filter'] || conf['Reply Hiding']) strikethroughQuotes.init(); if (conf['Anonymize']) anonymize.init(); if (conf['Time Formatting']) Time.init(); - if (conf['Filesize Formatting']) Filesize.init(); + if (conf['File Info Formatting']) FileFormat.init(); if (conf['Sauce']) sauce.init(); if (conf['Reveal Spoilers']) revealSpoilers.init(); if (conf['Image Auto-Gif']) imgGif.init(); @@ -3793,10 +3788,6 @@ } nodes = $$('.op, a + table', form); Main.node(nodes, true); - if (!g.REPLY && conf['Filesize Formatting']) { - Filesize.fstype = 0; - Filesize.getFormat(); - } if (MutationObserver = window.WebKitMutationObserver || window.MozMutationObserver || window.OMutationObserver || window.MutationObserver) { observer = new MutationObserver(Main.observer); return observer.observe(form, { @@ -4084,6 +4075,12 @@ td.replyhider {\ float: left;\ pointer-events: none;\ }\ +.filesize .fnfull, .filesize:hover .fntrunc {\ + display: none;\ +}\ +.filesize:hover .fnfull {\ + display: inline;\ +}\ img[md5], img[md5] + img {\ pointer-events: all;\ }\ diff --git a/changelog b/changelog index 3573ee786..6e22cf309 100644 --- a/changelog +++ b/changelog @@ -1,9 +1,20 @@ master +- aeosynth / ahodesuka + new option: expand images from current position +- ahodesuka + Add Open Reply in New Tab option for replies made from the main board (not dumping). + Scroll back up (top of anchor - 42px) when unexpanding images. + Reply/Thread File Info Formatting: + - Link: %l. + - Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default). + - Resolution/PDF: %r + - Original filename: %n (truncated if longer than 40~ character, on hover the entire string is shown. - Mayhem The Filter now has per filter settings: - - Filter the OP along its thread, replies only, or both. + - Filter the OP only along its thread, replies only, or both. - Per boards, or global. - Highlight, or hide. + - Highlighted OPs will have their threads put on top of the board page by default. New filter group: Image dimensions. Fix posting on Safari. Fix rare case where the QR would not accept certain image types. @@ -101,7 +112,7 @@ master see https://github.com/MayhemYDG/4chan-x/issues/136 2.24.4 -- ahokadesuka +- ahodesuka Scroll back up when unexpanding images. - e000 Prevent absurd cooldown durations. diff --git a/script.coffee b/script.coffee index a1bf6971d..3435f1d2b 100644 --- a/script.coffee +++ b/script.coffee @@ -5,7 +5,7 @@ config = 'Fix XXX\'d Post Numbers': [true, 'Replace XXX\'d post numbers with their actual number'] 'Keybinds': [true, 'Binds actions to keys'] 'Time Formatting': [true, 'Arbitrarily formatted timestamps, using your local time'] - 'Filesize Formatting': [true, 'Reformats the image information'] + 'File Info Formatting': [true, 'Reformats the file information'] 'Report Button': [true, 'Add report buttons'] 'Comment Expansion': [true, 'Expand too long comments'] 'Thread Expansion': [true, 'View all replies'] @@ -78,8 +78,8 @@ config = ].join '\n' time: '%m/%d/%y(%a)%H:%M' backlink: '>>%id' - filesizeR: '%l (%s, %wx%h, %n)' - filesizeT: '%l (%s, %wx%h)' + fileFormatR: '%l (%s, %r, %n)' + fileFormatT: '%l (%s, %r)' favicon: 'ferongr' hotkeys: openOptions: ['ctrl+o', 'Open Options'] @@ -1695,7 +1695,7 @@ options =

    Comment:

    Filename:

    Image dimensions:

    -

    Filesize:

    +

    FileFormat:

    Image MD5:

    @@ -1716,16 +1716,15 @@ options =
  • Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P
  • Minutes: %M
    • -
    Filesize Formatting is disabled.
    +
    File Info Formatting is disabled.
      - Reply Filesize formatting -
    • :
      • - Thread Filesize formatting -
    • :
      • + Reply File Info Formatting +
    • :
      • + Thread File Info Formatting +
    • :
    • Link: %l (lowercase L)
      • -
    • Size: %B (Bytes), %K (KB), %M (MB), %s (simplified unit)
      • -
    • Width: %w
      • -
    • Height: %h
      • +
    • Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
      • +
    • Resolution: %r (Displays PDF on /po/, for PDF\'s)
    • Original filename: %n (Reply only)
    Unread Favicon is disabled.
    @@ -1774,18 +1773,18 @@ options = $.on ta, 'change', $.cb.value #rice - (back = $ '[name=backlink]', dialog).value = conf['backlink'] - (time = $ '[name=time]', dialog).value = conf['time'] - (filesizeR = $ '[name=filesizeR]', dialog).value = conf['filesizeR'] - (filesizeT = $ '[name=filesizeT]', dialog).value = conf['filesizeT'] + (back = $ '[name=backlink]', dialog).value = conf['backlink'] + (time = $ '[name=time]', dialog).value = conf['time'] + (fileFormatR = $ '[name=fileFormatR]', dialog).value = conf['fileFormatR'] + (fileFormatT = $ '[name=fileFormatT]', dialog).value = conf['fileFormatT'] $.on back, 'keyup', $.cb.value $.on back, 'keyup', options.backlink $.on time, 'keyup', $.cb.value $.on time, 'keyup', options.time - $.on filesizeR, 'keyup', $.cb.value - $.on filesizeR, 'keyup', options.filesize - $.on filesizeT, 'keyup', $.cb.value - $.on filesizeT, 'keyup', options.filesize + $.on fileFormatR, 'keyup', $.cb.value + $.on fileFormatR, 'keyup', options.fileFormat + $.on fileFormatT, 'keyup', $.cb.value + $.on fileFormatT, 'keyup', options.fileFormat favicon = $ 'select', dialog favicon.value = conf['favicon'] $.on favicon, 'change', $.cb.value @@ -1818,8 +1817,8 @@ options = options.backlink.call back options.time.call time - options.filesize.call filesizeR - options.filesize.call filesizeT + options.fileFormat.call fileFormatR + options.fileFormat.call fileFormatT options.favicon.call favicon close: -> @@ -1846,18 +1845,14 @@ options = $.id('timePreview').textContent = Time.funk Time backlink: -> $.id('backlinkPreview').textContent = conf['backlink'].replace /%id/, '123456789' - filesize: () -> - Filesize.fstype = if @name is 'filesizeR' then 0 else 1 - Filesize.getFormat() - Filesize.data = { - link : '1329791824.png', - size : 996, - unit : 'KB', - width : 1366, - height : 768 - } - Filesize.data.filename = 'Untitled.png' if Filesize.fstype is 0 - $.id("#{@name}Preview").innerHTML = Filesize.funk Filesize + fileFormat: -> + FileFormat.data = + link : '1329791824.png' + size : 996 + unit : 'KB' + resolution: '1366x768' + filename : 'Untitled.png' + $.id("#{@name}Preview").innerHTML = FileFormat.funks[if @name is 'fileFormatR' then 0 else 1] FileFormat favicon: -> Favicon.switch() unread.update true @@ -2334,43 +2329,40 @@ Time = P: -> if Time.date.getHours() < 12 then 'am' else 'pm' y: -> Time.date.getFullYear() - 2000 -Filesize = +FileFormat = init: -> - Filesize.fstype = if g.REPLY then 0 else 1 - Filesize.fsconf = [ 'filesizeR', 'filesizeT' ] - Filesize.regEx = [ /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+)x(\d+),\s/, - /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+)x(\d+)\)/ ] + return if g.BOARD is 'f' + FileFormat.ffConf = [ 'fileFormatR', 'fileFormatT' ] + FileFormat.ffMtrs = [ /%([BKlMnrs])/g, /%([BKlMrs])/g ] + FileFormat.ffRgex = [ /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s/, + /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/ ] @parse = (node) -> - [_, link, size, unit, width, height, filename] = - node.innerHTML.match Filesize.regEx[Filesize.fstype] - { - 'link' : link, - 'size' : size, - 'unit' : unit, - 'width' : width, - 'height' : height, - 'filename': filename - } + FileFormat.ffType = if node.childNodes.length > 3 then 0 else 1 + [_, link, size, unit, resolution, filename] = + node.innerHTML.match FileFormat.ffRgex[FileFormat.ffType] + link : link + size : size + unit : unit + resolution: resolution + filename : filename - Filesize.getFormat() + FileFormat.funks = FileFormat.setFormats() g.callbacks.push @node node: (root) -> return if root.className is 'inline' or not node = $ '.filesize', root - Filesize.data = Filesize.parse node - filesize = $.el 'span', - className: 'filesize', - innerHTML: Filesize.funk(Filesize) + ' ' - $.replace node, filesize - getFormat: -> - code = conf[Filesize.fsconf[Filesize.fstype]].replace /%([BhKlMnsw])/g, (s, c) -> - if c of Filesize.formatters - "' + Filesize.formatters.#{c}() + '" - else - s - Filesize.funk = Function 'Filesize', "return '#{code}'" + FileFormat.data = FileFormat.parse node + node.innerHTML = FileFormat.funks[FileFormat.ffType](FileFormat) + ' ' + setFormats: -> + for i in [0..1] + code = conf[FileFormat.ffConf[i]].replace FileFormat.ffMtrs[i], (s, c) -> + if c of FileFormat.formatters + "' + FileFormat.formatters.#{c}() + '" + else + s + Function 'FileFormat', "return '#{code}'" convertUnit: (unitT) -> - size = Filesize.data.size - unitF = Filesize.data.unit + size = FileFormat.data.size + unitF = FileFormat.data.unit if unitF isnt unitT units = [ 'B', 'KB', 'MB' ] i = units.indexOf(unitF) - units.indexOf(unitT) @@ -2383,14 +2375,16 @@ Filesize = size = size.toFixed 2 "#{size} #{unitT}" formatters: - B: -> Filesize.convertUnit 'B' - h: -> Filesize.data.height - K: -> Filesize.convertUnit 'KB' - l: -> Filesize.data.link - M: -> Filesize.convertUnit 'MB' - n: -> if Filesize.fstype is 0 then Filesize.data.filename else '%n' - s: -> "#{Filesize.data.size} #{Filesize.data.unit}" - w: -> Filesize.data.width + B: -> FileFormat.convertUnit 'B' + K: -> FileFormat.convertUnit 'KB' + l: -> FileFormat.data.link + M: -> FileFormat.convertUnit 'MB' + n: -> if (ext = FileFormat.data.filename.lastIndexOf '.') > 38 + '' + FileFormat.data.filename + '' + FileFormat.data.filename.substr(0, 32) + ' (...)' + FileFormat.data.filename.substr(ext) + '' + else + FileFormat.data.filename + r: -> FileFormat.data.resolution + s: -> "#{FileFormat.data.size} #{FileFormat.data.unit}" getTitle = (thread) -> el = $ '.filetitle', thread @@ -2591,8 +2585,8 @@ quotePreview = imgGif.node qp if conf['Time Formatting'] Time.node qp - if conf['Filesize Formatting'] - Filesize.node qp if id isnt threadID + if conf['File Info Formatting'] + FileFormat.node qp if id isnt threadID quoteIndicators = init: -> @@ -2991,8 +2985,8 @@ Main = if conf['Time Formatting'] Time.init() - if conf['Filesize Formatting'] - Filesize.init() + if conf['File Info Formatting'] + FileFormat.init() if conf['Sauce'] sauce.init() @@ -3083,10 +3077,6 @@ Main = nodes = $$ '.op, a + table', form Main.node nodes, true - - if not g.REPLY and conf['Filesize Formatting'] - Filesize.fstype = 0 - Filesize.getFormat() if MutationObserver = window.WebKitMutationObserver or window.MozMutationObserver or window.OMutationObserver or window.MutationObserver observer = new MutationObserver Main.observer @@ -3353,6 +3343,12 @@ td.replyhider { float: left; pointer-events: none; } +.filesize .fnfull, .filesize:hover .fntrunc { + display: none; +} +.filesize:hover .fnfull { + display: inline; +} img[md5], img[md5] + img { pointer-events: all; } From ecf79d56f1afefd6a02203f32807d2bbaed55fbf Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Tue, 21 Feb 2012 15:41:39 -0600 Subject: [PATCH 06/11] FileFormat sounds stupid. --- 4chan_x.user.js | 88 ++++++++++++++++++++++++------------------------- script.coffee | 84 +++++++++++++++++++++++----------------------- 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 930cc2e1d..3fa4323f1 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -72,7 +72,7 @@ */ (function() { - var $, $$, DAY, Favicon, FileFormat, HOUR, MINUTE, Main, NAMESPACE, SECOND, Time, VERSION, anonymize, conf, config, d, engine, expandComment, expandThread, filter, flatten, g, getTitle, imgExpand, imgGif, imgHover, key, keybinds, log, nav, options, qr, quoteBacklink, quoteIndicators, quoteInline, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, strikethroughQuotes, threadHiding, threadStats, threading, titlePost, ui, unread, unxify, updater, val, watcher, _base; + var $, $$, DAY, Favicon, FileInfo, HOUR, MINUTE, Main, NAMESPACE, SECOND, Time, VERSION, anonymize, conf, config, d, engine, expandComment, expandThread, filter, flatten, g, getTitle, imgExpand, imgGif, imgHover, key, keybinds, log, nav, options, qr, quoteBacklink, quoteIndicators, quoteInline, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, strikethroughQuotes, threadHiding, threadStats, threading, titlePost, ui, unread, unxify, updater, val, watcher, _base; config = { main: { @@ -149,8 +149,8 @@ sauces: ['http://iqdb.org/?url=$1', 'http://www.google.com/searchbyimage?image_url=$1', '#http://tineye.com/search?url=$1', '#http://saucenao.com/search.php?db=999&url=$1', '#http://3d.iqdb.org/?url=$1', '#http://regex.info/exif.cgi?imgurl=$2', '# uploaders:', '#http://imgur.com/upload?url=$2', '#http://omploader.org/upload?url1=$2', '# "View Same" in archives:', '#http://archive.foolz.us/a/image/$3/', '#http://archive.installgentoo.net/g/image/$3'].join('\n'), time: '%m/%d/%y(%a)%H:%M', backlink: '>>%id', - fileFormatR: '%l (%s, %r, %n)', - fileFormatT: '%l (%s, %r)', + fileInfoR: '%l (%s, %r, %n)', + fileInfoT: '%l (%s, %r)', favicon: 'ferongr', hotkeys: { openOptions: ['ctrl+o', 'Open Options'], @@ -2079,7 +2079,7 @@ } }, dialog: function() { - var arr, back, checked, description, dialog, favicon, fileFormatR, fileFormatT, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, ta, time, tr, ul, _i, _j, _len, _len2, _ref, _ref2, _ref3, _ref4; + var arr, back, checked, description, dialog, favicon, fileInfoR, fileInfoT, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, ta, time, tr, ul, _i, _j, _len, _len2, _ref, _ref2, _ref3, _ref4; dialog = $.el('div', { id: 'options', className: 'reply dialog', @@ -2123,7 +2123,7 @@

    Comment:

    \

    Filename:

    \

    Image dimensions:

    \ -

    FileFormat:

    \ +

    FileInfo:

    \

    Image MD5:

    \ \ \ @@ -2147,9 +2147,9 @@
    File Info Formatting is disabled.
    \
      \ Reply File Info Formatting\ -
    • :
      • \ +
    • :
      • \ Thread File Info Formatting\ -
    • :
      • \ +
    • :
      • \
    • Link: %l (lowercase L)
      • \
    • Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
      • \
    • Resolution: %r (Displays PDF on /po/, for PDF\'s)
      • \ @@ -2208,16 +2208,16 @@ } (back = $('[name=backlink]', dialog)).value = conf['backlink']; (time = $('[name=time]', dialog)).value = conf['time']; - (fileFormatR = $('[name=fileFormatR]', dialog)).value = conf['fileFormatR']; - (fileFormatT = $('[name=fileFormatT]', dialog)).value = conf['fileFormatT']; + (fileInfoR = $('[name=fileInfoR]', dialog)).value = conf['fileInfoR']; + (fileInfoT = $('[name=fileInfoT]', dialog)).value = conf['fileInfoT']; $.on(back, 'keyup', $.cb.value); $.on(back, 'keyup', options.backlink); $.on(time, 'keyup', $.cb.value); $.on(time, 'keyup', options.time); - $.on(fileFormatR, 'keyup', $.cb.value); - $.on(fileFormatR, 'keyup', options.fileFormat); - $.on(fileFormatT, 'keyup', $.cb.value); - $.on(fileFormatT, 'keyup', options.fileFormat); + $.on(fileInfoR, 'keyup', $.cb.value); + $.on(fileInfoR, 'keyup', options.fileInfo); + $.on(fileInfoT, 'keyup', $.cb.value); + $.on(fileInfoT, 'keyup', options.fileInfo); favicon = $('select', dialog); favicon.value = conf['favicon']; $.on(favicon, 'change', $.cb.value); @@ -2256,8 +2256,8 @@ d.body.style.setProperty('overflow', 'hidden', null); options.backlink.call(back); options.time.call(time); - options.fileFormat.call(fileFormatR); - options.fileFormat.call(fileFormatT); + options.fileInfo.call(fileInfoR); + options.fileInfo.call(fileInfoT); return options.favicon.call(favicon); }, close: function() { @@ -2286,15 +2286,15 @@ backlink: function() { return $.id('backlinkPreview').textContent = conf['backlink'].replace(/%id/, '123456789'); }, - fileFormat: function() { - FileFormat.data = { + fileInfo: function() { + FileInfo.data = { link: '1329791824.png', size: 996, unit: 'KB', resolution: '1366x768', filename: 'Untitled.png' }; - return $.id("" + this.name + "Preview").innerHTML = FileFormat.funks[this.name === 'fileFormatR' ? 0 : 1](FileFormat); + return $.id("" + this.name + "Preview").innerHTML = FileInfo.funks[this.name === 'fileInfoR' ? 0 : 1](FileInfo); }, favicon: function() { Favicon["switch"](); @@ -2889,16 +2889,16 @@ } }; - FileFormat = { + FileInfo = { init: function() { if (g.BOARD === 'f') return; - FileFormat.ffConf = ['fileFormatR', 'fileFormatT']; - FileFormat.ffMtrs = [/%([BKlMnrs])/g, /%([BKlMrs])/g]; - FileFormat.ffRgex = [/File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s/, /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/]; + FileInfo.ffConf = ['fileInfoR', 'fileInfoT']; + FileInfo.ffMtrs = [/%([BKlMnrs])/g, /%([BKlMrs])/g]; + FileInfo.ffRgex = [/File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s/, /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/]; this.parse = function(node) { var filename, link, resolution, size, unit, _, _ref; - FileFormat.ffType = node.childNodes.length > 3 ? 0 : 1; - _ref = node.innerHTML.match(FileFormat.ffRgex[FileFormat.ffType]), _ = _ref[0], link = _ref[1], size = _ref[2], unit = _ref[3], resolution = _ref[4], filename = _ref[5]; + FileInfo.ffType = node.childNodes.length > 3 ? 0 : 1; + _ref = node.innerHTML.match(FileInfo.ffRgex[FileInfo.ffType]), _ = _ref[0], link = _ref[1], size = _ref[2], unit = _ref[3], resolution = _ref[4], filename = _ref[5]; return { link: link, size: size, @@ -2907,34 +2907,34 @@ filename: filename }; }; - FileFormat.funks = FileFormat.setFormats(); + FileInfo.funks = FileInfo.setFormats(); return g.callbacks.push(this.node); }, node: function(root) { var node; if (root.className === 'inline' || !(node = $('.filesize', root))) return; - FileFormat.data = FileFormat.parse(node); - return node.innerHTML = FileFormat.funks[FileFormat.ffType](FileFormat) + ' '; + FileInfo.data = FileInfo.parse(node); + return node.innerHTML = FileInfo.funks[FileInfo.ffType](FileInfo) + ' '; }, setFormats: function() { var code, i, _results; _results = []; for (i = 0; i <= 1; i++) { - code = conf[FileFormat.ffConf[i]].replace(FileFormat.ffMtrs[i], function(s, c) { - if (c in FileFormat.formatters) { - return "' + FileFormat.formatters." + c + "() + '"; + code = conf[FileInfo.ffConf[i]].replace(FileInfo.ffMtrs[i], function(s, c) { + if (c in FileInfo.formatters) { + return "' + FileInfo.formatters." + c + "() + '"; } else { return s; } }); - _results.push(Function('FileFormat', "return '" + code + "'")); + _results.push(Function('FileInfo', "return '" + code + "'")); } return _results; }, convertUnit: function(unitT) { var i, size, unitF, units; - size = FileFormat.data.size; - unitF = FileFormat.data.unit; + size = FileInfo.data.size; + unitF = FileInfo.data.unit; if (unitF !== unitT) { units = ['B', 'KB', 'MB']; i = units.indexOf(unitF) - units.indexOf(unitT); @@ -2956,30 +2956,30 @@ }, formatters: { B: function() { - return FileFormat.convertUnit('B'); + return FileInfo.convertUnit('B'); }, K: function() { - return FileFormat.convertUnit('KB'); + return FileInfo.convertUnit('KB'); }, l: function() { - return FileFormat.data.link; + return FileInfo.data.link; }, M: function() { - return FileFormat.convertUnit('MB'); + return FileInfo.convertUnit('MB'); }, n: function() { var ext; - if ((ext = FileFormat.data.filename.lastIndexOf('.')) > 38) { - return '' + FileFormat.data.filename + '' + FileFormat.data.filename.substr(0, 32) + ' (...)' + FileFormat.data.filename.substr(ext) + ''; + if ((ext = FileInfo.data.filename.lastIndexOf('.')) > 38) { + return '' + FileInfo.data.filename + '' + FileInfo.data.filename.substr(0, 32) + ' (...)' + FileInfo.data.filename.substr(ext) + ''; } else { - return FileFormat.data.filename; + return FileInfo.data.filename; } }, r: function() { - return FileFormat.data.resolution; + return FileInfo.data.resolution; }, s: function() { - return "" + FileFormat.data.size + " " + FileFormat.data.unit; + return "" + FileInfo.data.size + " " + FileInfo.data.unit; } } }; @@ -3249,7 +3249,7 @@ if (conf['Image Auto-Gif']) imgGif.node(qp); if (conf['Time Formatting']) Time.node(qp); if (conf['File Info Formatting']) { - if (id !== threadID) return FileFormat.node(qp); + if (id !== threadID) return FileInfo.node(qp); } } }; @@ -3743,7 +3743,7 @@ if (conf['Filter'] || conf['Reply Hiding']) strikethroughQuotes.init(); if (conf['Anonymize']) anonymize.init(); if (conf['Time Formatting']) Time.init(); - if (conf['File Info Formatting']) FileFormat.init(); + if (conf['File Info Formatting']) FileInfo.init(); if (conf['Sauce']) sauce.init(); if (conf['Reveal Spoilers']) revealSpoilers.init(); if (conf['Image Auto-Gif']) imgGif.init(); diff --git a/script.coffee b/script.coffee index 3435f1d2b..8227551ca 100644 --- a/script.coffee +++ b/script.coffee @@ -78,8 +78,8 @@ config = ].join '\n' time: '%m/%d/%y(%a)%H:%M' backlink: '>>%id' - fileFormatR: '%l (%s, %r, %n)' - fileFormatT: '%l (%s, %r)' + fileInfoR: '%l (%s, %r, %n)' + fileInfoT: '%l (%s, %r)' favicon: 'ferongr' hotkeys: openOptions: ['ctrl+o', 'Open Options'] @@ -1695,7 +1695,7 @@ options =

      Comment:

      Filename:

      Image dimensions:

      -

      FileFormat:

      +

      FileInfo:

      Image MD5:

      @@ -1719,9 +1719,9 @@ options =
      File Info Formatting is disabled.
        Reply File Info Formatting -
      • :
        • +
      • :
        • Thread File Info Formatting -
      • :
        • +
      • :
      • Link: %l (lowercase L)
      • Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
      • Resolution: %r (Displays PDF on /po/, for PDF\'s)
        • @@ -1775,16 +1775,16 @@ options = #rice (back = $ '[name=backlink]', dialog).value = conf['backlink'] (time = $ '[name=time]', dialog).value = conf['time'] - (fileFormatR = $ '[name=fileFormatR]', dialog).value = conf['fileFormatR'] - (fileFormatT = $ '[name=fileFormatT]', dialog).value = conf['fileFormatT'] + (fileInfoR = $ '[name=fileInfoR]', dialog).value = conf['fileInfoR'] + (fileInfoT = $ '[name=fileInfoT]', dialog).value = conf['fileInfoT'] $.on back, 'keyup', $.cb.value $.on back, 'keyup', options.backlink $.on time, 'keyup', $.cb.value $.on time, 'keyup', options.time - $.on fileFormatR, 'keyup', $.cb.value - $.on fileFormatR, 'keyup', options.fileFormat - $.on fileFormatT, 'keyup', $.cb.value - $.on fileFormatT, 'keyup', options.fileFormat + $.on fileInfoR, 'keyup', $.cb.value + $.on fileInfoR, 'keyup', options.fileInfo + $.on fileInfoT, 'keyup', $.cb.value + $.on fileInfoT, 'keyup', options.fileInfo favicon = $ 'select', dialog favicon.value = conf['favicon'] $.on favicon, 'change', $.cb.value @@ -1817,8 +1817,8 @@ options = options.backlink.call back options.time.call time - options.fileFormat.call fileFormatR - options.fileFormat.call fileFormatT + options.fileInfo.call fileInfoR + options.fileInfo.call fileInfoT options.favicon.call favicon close: -> @@ -1845,14 +1845,14 @@ options = $.id('timePreview').textContent = Time.funk Time backlink: -> $.id('backlinkPreview').textContent = conf['backlink'].replace /%id/, '123456789' - fileFormat: -> - FileFormat.data = + fileInfo: -> + FileInfo.data = link : '1329791824.png' size : 996 unit : 'KB' resolution: '1366x768' filename : 'Untitled.png' - $.id("#{@name}Preview").innerHTML = FileFormat.funks[if @name is 'fileFormatR' then 0 else 1] FileFormat + $.id("#{@name}Preview").innerHTML = FileInfo.funks[if @name is 'fileInfoR' then 0 else 1] FileInfo favicon: -> Favicon.switch() unread.update true @@ -2329,40 +2329,40 @@ Time = P: -> if Time.date.getHours() < 12 then 'am' else 'pm' y: -> Time.date.getFullYear() - 2000 -FileFormat = +FileInfo = init: -> return if g.BOARD is 'f' - FileFormat.ffConf = [ 'fileFormatR', 'fileFormatT' ] - FileFormat.ffMtrs = [ /%([BKlMnrs])/g, /%([BKlMrs])/g ] - FileFormat.ffRgex = [ /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s/, + FileInfo.ffConf = [ 'fileInfoR', 'fileInfoT' ] + FileInfo.ffMtrs = [ /%([BKlMnrs])/g, /%([BKlMrs])/g ] + FileInfo.ffRgex = [ /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s/, /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/ ] @parse = (node) -> - FileFormat.ffType = if node.childNodes.length > 3 then 0 else 1 + FileInfo.ffType = if node.childNodes.length > 3 then 0 else 1 [_, link, size, unit, resolution, filename] = - node.innerHTML.match FileFormat.ffRgex[FileFormat.ffType] + node.innerHTML.match FileInfo.ffRgex[FileInfo.ffType] link : link size : size unit : unit resolution: resolution filename : filename - FileFormat.funks = FileFormat.setFormats() + FileInfo.funks = FileInfo.setFormats() g.callbacks.push @node node: (root) -> return if root.className is 'inline' or not node = $ '.filesize', root - FileFormat.data = FileFormat.parse node - node.innerHTML = FileFormat.funks[FileFormat.ffType](FileFormat) + ' ' + FileInfo.data = FileInfo.parse node + node.innerHTML = FileInfo.funks[FileInfo.ffType](FileInfo) + ' ' setFormats: -> for i in [0..1] - code = conf[FileFormat.ffConf[i]].replace FileFormat.ffMtrs[i], (s, c) -> - if c of FileFormat.formatters - "' + FileFormat.formatters.#{c}() + '" + code = conf[FileInfo.ffConf[i]].replace FileInfo.ffMtrs[i], (s, c) -> + if c of FileInfo.formatters + "' + FileInfo.formatters.#{c}() + '" else s - Function 'FileFormat', "return '#{code}'" + Function 'FileInfo', "return '#{code}'" convertUnit: (unitT) -> - size = FileFormat.data.size - unitF = FileFormat.data.unit + size = FileInfo.data.size + unitF = FileInfo.data.unit if unitF isnt unitT units = [ 'B', 'KB', 'MB' ] i = units.indexOf(unitF) - units.indexOf(unitT) @@ -2375,16 +2375,16 @@ FileFormat = size = size.toFixed 2 "#{size} #{unitT}" formatters: - B: -> FileFormat.convertUnit 'B' - K: -> FileFormat.convertUnit 'KB' - l: -> FileFormat.data.link - M: -> FileFormat.convertUnit 'MB' - n: -> if (ext = FileFormat.data.filename.lastIndexOf '.') > 38 - '' + FileFormat.data.filename + '' + FileFormat.data.filename.substr(0, 32) + ' (...)' + FileFormat.data.filename.substr(ext) + '' + B: -> FileInfo.convertUnit 'B' + K: -> FileInfo.convertUnit 'KB' + l: -> FileInfo.data.link + M: -> FileInfo.convertUnit 'MB' + n: -> if (ext = FileInfo.data.filename.lastIndexOf '.') > 38 + '' + FileInfo.data.filename + '' + FileInfo.data.filename.substr(0, 32) + ' (...)' + FileInfo.data.filename.substr(ext) + '' else - FileFormat.data.filename - r: -> FileFormat.data.resolution - s: -> "#{FileFormat.data.size} #{FileFormat.data.unit}" + FileInfo.data.filename + r: -> FileInfo.data.resolution + s: -> "#{FileInfo.data.size} #{FileInfo.data.unit}" getTitle = (thread) -> el = $ '.filetitle', thread @@ -2586,7 +2586,7 @@ quotePreview = if conf['Time Formatting'] Time.node qp if conf['File Info Formatting'] - FileFormat.node qp if id isnt threadID + FileInfo.node qp if id isnt threadID quoteIndicators = init: -> @@ -2986,7 +2986,7 @@ Main = Time.init() if conf['File Info Formatting'] - FileFormat.init() + FileInfo.init() if conf['Sauce'] sauce.init() From c5fd4455dca3b9dfef30fd5b6762954f1c219063 Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Tue, 21 Feb 2012 16:47:37 -0600 Subject: [PATCH 07/11] Add original file name to links inside threads. Add truncated/untrancated parameters. --- 4chan_x.user.js | 27 ++++++++++++++++++++------- changelog | 4 ++-- script.coffee | 22 +++++++++++++++------- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 3fa4323f1..bb8e48d38 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -149,8 +149,8 @@ sauces: ['http://iqdb.org/?url=$1', 'http://www.google.com/searchbyimage?image_url=$1', '#http://tineye.com/search?url=$1', '#http://saucenao.com/search.php?db=999&url=$1', '#http://3d.iqdb.org/?url=$1', '#http://regex.info/exif.cgi?imgurl=$2', '# uploaders:', '#http://imgur.com/upload?url=$2', '#http://omploader.org/upload?url1=$2', '# "View Same" in archives:', '#http://archive.foolz.us/a/image/$3/', '#http://archive.installgentoo.net/g/image/$3'].join('\n'), time: '%m/%d/%y(%a)%H:%M', backlink: '>>%id', - fileInfoR: '%l (%s, %r, %n)', - fileInfoT: '%l (%s, %r)', + fileInfoR: '%l, %s, %r', + fileInfoT: '%l, %s, %r', favicon: 'ferongr', hotkeys: { openOptions: ['ctrl+o', 'Open Options'], @@ -2146,14 +2146,16 @@
      \
      File Info Formatting is disabled.
      \
        \ - Reply File Info Formatting\ -
      • :
        • \ Thread File Info Formatting\
      • :
        • \
      • Link: %l (lowercase L)
        • \
      • Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
        • \
      • Resolution: %r (Displays PDF on /po/, for PDF\'s)
        • \ -
      • Original filename: %n (Reply only)
        • \ + Reply File Info Formatting\ +
      • :
        • \ +
      • All thread formatters also work for reply formatting.
        • \ +
      • Link (with original file name): %l (lowercase L)(Truncated), %L (Untruncated)
        • \ +
      • Original file name: %n (Truncated), %N (Untruncated)
        • \
      \
      Unread Favicon is disabled.
      \ Unread favicons
      \ @@ -2294,6 +2296,7 @@ resolution: '1366x768', filename: 'Untitled.png' }; + FileInfo.funks = FileInfo.setFormats(); return $.id("" + this.name + "Preview").innerHTML = FileInfo.funks[this.name === 'fileInfoR' ? 0 : 1](FileInfo); }, favicon: function() { @@ -2893,7 +2896,7 @@ init: function() { if (g.BOARD === 'f') return; FileInfo.ffConf = ['fileInfoR', 'fileInfoT']; - FileInfo.ffMtrs = [/%([BKlMnrs])/g, /%([BKlMrs])/g]; + FileInfo.ffMtrs = [/%([BKlLMnNrs])/g, /%([BKlMrs])/g]; FileInfo.ffRgex = [/File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s/, /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/]; this.parse = function(node) { var filename, link, resolution, size, unit, _, _ref; @@ -2962,7 +2965,14 @@ return FileInfo.convertUnit('KB'); }, l: function() { - return FileInfo.data.link; + if (FileInfo.ffType === 0) { + return FileInfo.data.link.replace(/>\d+\.\w+' + FileInfo.formatters.n() + '<'); + } else { + return FileInfo.data.link; + } + }, + L: function() { + return FileInfo.data.link.replace(/>\d+\.\w+' + FileInfo.data.filename + '<'); }, M: function() { return FileInfo.convertUnit('MB'); @@ -2975,6 +2985,9 @@ return FileInfo.data.filename; } }, + N: function() { + return FileInfo.data.filename; + }, r: function() { return FileInfo.data.resolution; }, diff --git a/changelog b/changelog index 6e22cf309..dc82babf8 100644 --- a/changelog +++ b/changelog @@ -5,10 +5,10 @@ master Add Open Reply in New Tab option for replies made from the main board (not dumping). Scroll back up (top of anchor - 42px) when unexpanding images. Reply/Thread File Info Formatting: - - Link: %l. + - Link: %l, %L (Original file names are shown inside threads). - Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default). - Resolution/PDF: %r - - Original filename: %n (truncated if longer than 40~ character, on hover the entire string is shown. + - Original filename: %n, %N. - Mayhem The Filter now has per filter settings: - Filter the OP only along its thread, replies only, or both. diff --git a/script.coffee b/script.coffee index 8227551ca..bd685753d 100644 --- a/script.coffee +++ b/script.coffee @@ -78,8 +78,8 @@ config = ].join '\n' time: '%m/%d/%y(%a)%H:%M' backlink: '>>%id' - fileInfoR: '%l (%s, %r, %n)' - fileInfoT: '%l (%s, %r)' + fileInfoR: '%l, %s, %r' + fileInfoT: '%l, %s, %r' favicon: 'ferongr' hotkeys: openOptions: ['ctrl+o', 'Open Options'] @@ -1718,14 +1718,16 @@ options =
    File Info Formatting is disabled.
      - Reply File Info Formatting -
    • :
      • Thread File Info Formatting
    • :
    • Link: %l (lowercase L)
    • Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
    • Resolution: %r (Displays PDF on /po/, for PDF\'s)
      • -
    • Original filename: %n (Reply only)
      • + Reply File Info Formatting +
    • :
      • +
    • All thread formatters also work for reply formatting.
      • +
    • Link (with original file name): %l (lowercase L)(Truncated), %L (Untruncated)
      • +
    • Original file name: %n (Truncated), %N (Untruncated)
    Unread Favicon is disabled.
    Unread favicons
    @@ -1852,6 +1854,7 @@ options = unit : 'KB' resolution: '1366x768' filename : 'Untitled.png' + FileInfo.funks = FileInfo.setFormats() $.id("#{@name}Preview").innerHTML = FileInfo.funks[if @name is 'fileInfoR' then 0 else 1] FileInfo favicon: -> Favicon.switch() @@ -2333,7 +2336,7 @@ FileInfo = init: -> return if g.BOARD is 'f' FileInfo.ffConf = [ 'fileInfoR', 'fileInfoT' ] - FileInfo.ffMtrs = [ /%([BKlMnrs])/g, /%([BKlMrs])/g ] + FileInfo.ffMtrs = [ /%([BKlLMnNrs])/g, /%([BKlMrs])/g ] FileInfo.ffRgex = [ /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s/, /File:\s()-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/ ] @parse = (node) -> @@ -2377,12 +2380,17 @@ FileInfo = formatters: B: -> FileInfo.convertUnit 'B' K: -> FileInfo.convertUnit 'KB' - l: -> FileInfo.data.link + l: -> if FileInfo.ffType is 0 + FileInfo.data.link.replace />\d+\.\w+' + FileInfo.formatters.n() + '<' + else + FileInfo.data.link + L: -> FileInfo.data.link.replace />\d+\.\w+' + FileInfo.data.filename + '<' M: -> FileInfo.convertUnit 'MB' n: -> if (ext = FileInfo.data.filename.lastIndexOf '.') > 38 '' + FileInfo.data.filename + '' + FileInfo.data.filename.substr(0, 32) + ' (...)' + FileInfo.data.filename.substr(ext) + '' else FileInfo.data.filename + N: -> FileInfo.data.filename r: -> FileInfo.data.resolution s: -> "#{FileInfo.data.size} #{FileInfo.data.unit}" From 2cab8f26b32fbbc21c53f00d7d43061dc666d3a1 Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Tue, 21 Feb 2012 17:35:47 -0600 Subject: [PATCH 08/11] Fix a find & replace mistake, apply FileInfo on OP's (incase it is cross-thread/board). --- 4chan_x.user.js | 6 ++---- script.coffee | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 35a910a13..6e433146e 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2147,7 +2147,7 @@

    Comment:

    \

    Filename:

    \

    Image dimensions:

    \ -

    FileInfo:

    \ +

    Filesize:

    \

    Image MD5:

    \ \ \ @@ -3286,9 +3286,7 @@ qp.innerHTML = html; if (conf['Image Auto-Gif']) imgGif.node(qp); if (conf['Time Formatting']) Time.node(qp); - if (conf['File Info Formatting']) { - if (id !== threadID) return FileInfo.node(qp); - } + if (conf['File Info Formatting']) return FileInfo.node(qp); } }; diff --git a/script.coffee b/script.coffee index 1f20b1a6b..46c64c395 100644 --- a/script.coffee +++ b/script.coffee @@ -1743,7 +1743,7 @@ options =

    Comment:

    Filename:

    Image dimensions:

    -

    FileInfo:

    +

    Filesize:

    Image MD5:

    @@ -2643,7 +2643,7 @@ quotePreview = if conf['Time Formatting'] Time.node qp if conf['File Info Formatting'] - FileInfo.node qp if id isnt threadID + FileInfo.node qp quoteIndicators = init: -> From 8bc1a4c176427579bde345e4c63b524c62ef57fa Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Wed, 22 Feb 2012 10:08:38 -0600 Subject: [PATCH 09/11] Fix preview inside options for File Info. Update changelog. --- 4chan_x.user.js | 3 ++- changelog | 11 ++++++----- script.coffee | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 18ce4a2ff..36878d91c 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2332,6 +2332,7 @@ return $.id('backlinkPreview').textContent = conf['backlink'].replace(/%id/, '123456789'); }, fileInfo: function() { + FileInfo.ffType = this.name === 'fileInfoR' ? 0 : 1; FileInfo.data = { link: '1329791824.png', size: 996, @@ -2340,7 +2341,7 @@ filename: 'Untitled.png' }; FileInfo.funks = FileInfo.setFormats(); - return $.id("" + this.name + "Preview").innerHTML = FileInfo.funks[this.name === 'fileInfoR' ? 0 : 1](FileInfo); + return $.id("" + this.name + "Preview").innerHTML = FileInfo.funks[FileInfo.ffType](FileInfo); }, favicon: function() { Favicon["switch"](); diff --git a/changelog b/changelog index 6c0aee166..6ee8b4e95 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,10 @@ master +-ahodesuka + Reply/Thread File Info Formatting: + - Link: %l, %L (Original file names are shown inside threads). + - Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default). + - Resolution/PDF: %r + - Original filename: %n, %N. 2.27.1 - Mayhem @@ -11,11 +17,6 @@ master - ahodesuka Add Open Reply in New Tab option for replies made from the main board (not dumping). Scroll back up (top of anchor - 42px) when unexpanding images. - Reply/Thread File Info Formatting: - - Link: %l, %L (Original file names are shown inside threads). - - Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default). - - Resolution/PDF: %r - - Original filename: %n, %N. - Mayhem The Filter now has per filter settings: - Filter the OP only along its thread, replies only, or both. diff --git a/script.coffee b/script.coffee index df1567f64..9dc5af705 100644 --- a/script.coffee +++ b/script.coffee @@ -1914,6 +1914,7 @@ options = backlink: -> $.id('backlinkPreview').textContent = conf['backlink'].replace /%id/, '123456789' fileInfo: -> + FileInfo.ffType = if @name is 'fileInfoR' then 0 else 1 FileInfo.data = link : '1329791824.png' size : 996 @@ -1921,7 +1922,7 @@ options = resolution: '1366x768' filename : 'Untitled.png' FileInfo.funks = FileInfo.setFormats() - $.id("#{@name}Preview").innerHTML = FileInfo.funks[if @name is 'fileInfoR' then 0 else 1] FileInfo + $.id("#{@name}Preview").innerHTML = FileInfo.funks[FileInfo.ffType] FileInfo favicon: -> Favicon.switch() unread.update true From 214652b6cff51ff41501d3da2d777adb895aafda Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Thu, 23 Feb 2012 15:37:34 -0600 Subject: [PATCH 10/11] Show full file name on filename hover, instead of .fileize. --- 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 f2b11af6c..d6f5920b9 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -4137,10 +4137,10 @@ td.replyhider {\ float: left;\ pointer-events: none;\ }\ -.filesize .fnfull, .filesize:hover .fntrunc {\ +.filesize a .fnfull, .filesize a:hover .fntrunc {\ display: none;\ }\ -.filesize:hover .fnfull {\ +.filesize a:hover .fnfull {\ display: inline;\ }\ img[md5], img[md5] + img {\ diff --git a/script.coffee b/script.coffee index 224a53cde..f9195337b 100644 --- a/script.coffee +++ b/script.coffee @@ -3425,10 +3425,10 @@ td.replyhider { float: left; pointer-events: none; } -.filesize .fnfull, .filesize:hover .fntrunc { +.filesize a .fnfull, .filesize a:hover .fntrunc { display: none; } -.filesize:hover .fnfull { +.filesize a:hover .fnfull { display: inline; } img[md5], img[md5] + img { From 07f1921150a0d6f5694a83fc174d2e0e11b4a163 Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Thu, 23 Feb 2012 15:44:50 -0600 Subject: [PATCH 11/11] Use :not, cause we ain't supportin' IE. --- 4chan_x.user.js | 5 +---- script.coffee | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index d6f5920b9..5db7cd76f 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -4137,12 +4137,9 @@ td.replyhider {\ float: left;\ pointer-events: none;\ }\ -.filesize a .fnfull, .filesize a:hover .fntrunc {\ +.filesize a:not(:hover) .fnfull, .filesize a:hover .fntrunc {\ display: none;\ }\ -.filesize a:hover .fnfull {\ - display: inline;\ -}\ img[md5], img[md5] + img {\ pointer-events: all;\ }\ diff --git a/script.coffee b/script.coffee index f9195337b..7a41ed83d 100644 --- a/script.coffee +++ b/script.coffee @@ -3425,12 +3425,9 @@ td.replyhider { float: left; pointer-events: none; } -.filesize a .fnfull, .filesize a:hover .fntrunc { +.filesize a:not(:hover) .fnfull, .filesize a:hover .fntrunc { display: none; } -.filesize a:hover .fnfull { - display: inline; -} img[md5], img[md5] + img { pointer-events: all; }