From 8bc1a4c176427579bde345e4c63b524c62ef57fa Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Wed, 22 Feb 2012 10:08:38 -0600 Subject: [PATCH] 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