diff --git a/CHANGELOG.md b/CHANGELOG.md index a6c0b8c62..2f0044fc3 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.7.63 +*2014-06-16* + **ccd0** - Fix filename bug introduced in previous release. diff --git a/LICENSE b/LICENSE index 496b0963f..46c33356a 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.7.62 - 2014-06-16 +* 4chan X - Version 1.7.63 - 2014-06-16 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index b539a41c8..ac51c6127 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.7.62 +// @version 1.7.63 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 6ac0480e0..39936cb89 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.7.62 +// @version 1.7.63 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.7.62 - 2014-06-16 +* 4chan X - Version 1.7.63 - 2014-06-16 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -374,7 +374,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.62', + VERSION: '1.7.63', NAMESPACE: '4chan X.', boards: {} }; @@ -3107,7 +3107,7 @@ This function contains code from 4chan-JS (https://github.com/4chan/4chan-JS). @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE */ - var E, boardID, capcode, container, date, dateUTC, email, file, fileSize, fileThumb, flagCode, flagName, h_capcodeClass, h_capcodeIcon, h_capcodeStart, h_closed, h_comment, h_emailEnd, h_emailStart, h_file, h_fileDims, h_fileInfo, h_flag, h_gifIcon, h_imgSrc, h_pageIcon, h_postClass, h_quoteLink, h_replyLink, h_sideArrows, h_staticPath, h_sticky, h_tripcode, h_userID, href, isClosed, isOP, isSticky, name, pageNum, postID, quote, shortFilename, spoilerRange, subject, threadID, tripcode, uniqueID, _i, _len, _ref; + var E, boardID, capcode, container, date, dateUTC, email, file, fileSize, fileThumb, flagCode, flagName, h_capcodeClass, h_capcodeIcon, h_capcodeStart, h_closed, h_comment, h_emailEnd, h_emailStart, h_file, h_fileDims, h_fileInfo, h_fileTitle1, h_fileTitle2, h_flag, h_gifIcon, h_imgSrc, h_pageIcon, h_postClass, h_quoteLink, h_replyLink, h_sideArrows, h_staticPath, h_sticky, h_tripcode, h_userID, href, isClosed, isOP, isSticky, name, pageNum, postID, quote, shortFilename, spoilerRange, subject, threadID, tripcode, uniqueID, _i, _len, _ref; E = Build.h_escape; postID = o.postID, threadID = o.threadID, boardID = o.boardID, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, h_comment = o.h_comment, file = o.file; name || (name = ''); @@ -3180,7 +3180,6 @@ fileSize = $.bytesToString(file.size); fileThumb = file.turl; if (file.isSpoiler) { - fileSize = "Spoiler Image, " + fileSize; if (!isArchived) { fileThumb = "" + h_staticPath + "spoiler"; if (spoilerRange = Build.spoilerRange[boardID]) { @@ -3189,8 +3188,10 @@ fileThumb += '.png'; file.twidth = file.theight = 100; } + shortFilename = 'Spoiler Image'; + } else { + shortFilename = Build.shortFilename(file.name); } - shortFilename = Build.shortFilename(file.name); if (boardID === 'f') { h_imgSrc = ''; } else { @@ -3203,16 +3204,16 @@ } else { h_fileDims = "" + (+file.width) + "x" + (+file.height); } - h_fileInfo = "
" + (E(file.timestamp)) + ""; - h_fileInfo += "-(" + (E(fileSize)) + ", " + h_fileDims; - if (!file.isSpoiler) { - h_fileInfo += ", " + (E(shortFilename)) + ""; - } - h_fileInfo += ')
'; + h_fileInfo = "
"; + h_fileInfo += "File: " + (E(shortFilename)) + " (" + (E(fileSize)) + ", " + h_fileDims + ")"; + h_fileInfo += '
'; h_file = "
" + h_fileInfo + h_imgSrc + "
"; } else { h_file = ''; @@ -12479,7 +12480,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13324,7 +13325,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.62.' + innerHTML: '4chan X has been updated to version 1.7.63.' }); new Notice('info', el, 15); } else { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 75ee164b6..150a374a6 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/crx.crx b/builds/crx.crx index ff620e8e6..0cfa77c54 100644 Binary files a/builds/crx.crx and b/builds/crx.crx differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 790abe2d5..375196003 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.7.62", + "version": "1.7.63", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index 517256824..dadcf1dda 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.62 - 2014-06-16 +* 4chan X - Version 1.7.63 - 2014-06-16 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -349,7 +349,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.62', + VERSION: '1.7.63', NAMESPACE: '4chan X.', boards: {} }; @@ -3142,7 +3142,7 @@ This function contains code from 4chan-JS (https://github.com/4chan/4chan-JS). @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE */ - var E, boardID, capcode, container, date, dateUTC, email, file, fileSize, fileThumb, flagCode, flagName, h_capcodeClass, h_capcodeIcon, h_capcodeStart, h_closed, h_comment, h_emailEnd, h_emailStart, h_file, h_fileDims, h_fileInfo, h_flag, h_gifIcon, h_imgSrc, h_pageIcon, h_postClass, h_quoteLink, h_replyLink, h_sideArrows, h_staticPath, h_sticky, h_tripcode, h_userID, href, isClosed, isOP, isSticky, name, pageNum, postID, quote, shortFilename, spoilerRange, subject, threadID, tripcode, uniqueID, _i, _len, _ref; + var E, boardID, capcode, container, date, dateUTC, email, file, fileSize, fileThumb, flagCode, flagName, h_capcodeClass, h_capcodeIcon, h_capcodeStart, h_closed, h_comment, h_emailEnd, h_emailStart, h_file, h_fileDims, h_fileInfo, h_fileTitle1, h_fileTitle2, h_flag, h_gifIcon, h_imgSrc, h_pageIcon, h_postClass, h_quoteLink, h_replyLink, h_sideArrows, h_staticPath, h_sticky, h_tripcode, h_userID, href, isClosed, isOP, isSticky, name, pageNum, postID, quote, shortFilename, spoilerRange, subject, threadID, tripcode, uniqueID, _i, _len, _ref; E = Build.h_escape; postID = o.postID, threadID = o.threadID, boardID = o.boardID, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, h_comment = o.h_comment, file = o.file; name || (name = ''); @@ -3215,7 +3215,6 @@ fileSize = $.bytesToString(file.size); fileThumb = file.turl; if (file.isSpoiler) { - fileSize = "Spoiler Image, " + fileSize; if (!isArchived) { fileThumb = "" + h_staticPath + "spoiler"; if (spoilerRange = Build.spoilerRange[boardID]) { @@ -3224,8 +3223,10 @@ fileThumb += '.png'; file.twidth = file.theight = 100; } + shortFilename = 'Spoiler Image'; + } else { + shortFilename = Build.shortFilename(file.name); } - shortFilename = Build.shortFilename(file.name); if (boardID === 'f') { h_imgSrc = ''; } else { @@ -3238,16 +3239,16 @@ } else { h_fileDims = "" + (+file.width) + "x" + (+file.height); } - h_fileInfo = "
" + (E(file.timestamp)) + ""; - h_fileInfo += "-(" + (E(fileSize)) + ", " + h_fileDims; - if (!file.isSpoiler) { - h_fileInfo += ", " + (E(shortFilename)) + ""; - } - h_fileInfo += ')
'; + h_fileInfo = "
"; + h_fileInfo += "File: " + (E(shortFilename)) + " (" + (E(fileSize)) + ", " + h_fileDims + ")"; + h_fileInfo += '
'; h_file = "
" + h_fileInfo + h_imgSrc + "
"; } else { h_file = ''; @@ -12473,7 +12474,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13305,7 +13306,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.62.' + innerHTML: '4chan X has been updated to version 1.7.63.' }); new Notice('info', el, 15); } else { diff --git a/builds/updates.xml b/builds/updates.xml index f764d78f5..0b5556be6 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/wcrx/manifest.json b/builds/wcrx/manifest.json index c00e8061f..15d520cf8 100644 --- a/builds/wcrx/manifest.json +++ b/builds/wcrx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.7.62", + "version": "1.7.63", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/wcrx/script.js b/builds/wcrx/script.js index 517256824..dadcf1dda 100644 --- a/builds/wcrx/script.js +++ b/builds/wcrx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.62 - 2014-06-16 +* 4chan X - Version 1.7.63 - 2014-06-16 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -349,7 +349,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.62', + VERSION: '1.7.63', NAMESPACE: '4chan X.', boards: {} }; @@ -3142,7 +3142,7 @@ This function contains code from 4chan-JS (https://github.com/4chan/4chan-JS). @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE */ - var E, boardID, capcode, container, date, dateUTC, email, file, fileSize, fileThumb, flagCode, flagName, h_capcodeClass, h_capcodeIcon, h_capcodeStart, h_closed, h_comment, h_emailEnd, h_emailStart, h_file, h_fileDims, h_fileInfo, h_flag, h_gifIcon, h_imgSrc, h_pageIcon, h_postClass, h_quoteLink, h_replyLink, h_sideArrows, h_staticPath, h_sticky, h_tripcode, h_userID, href, isClosed, isOP, isSticky, name, pageNum, postID, quote, shortFilename, spoilerRange, subject, threadID, tripcode, uniqueID, _i, _len, _ref; + var E, boardID, capcode, container, date, dateUTC, email, file, fileSize, fileThumb, flagCode, flagName, h_capcodeClass, h_capcodeIcon, h_capcodeStart, h_closed, h_comment, h_emailEnd, h_emailStart, h_file, h_fileDims, h_fileInfo, h_fileTitle1, h_fileTitle2, h_flag, h_gifIcon, h_imgSrc, h_pageIcon, h_postClass, h_quoteLink, h_replyLink, h_sideArrows, h_staticPath, h_sticky, h_tripcode, h_userID, href, isClosed, isOP, isSticky, name, pageNum, postID, quote, shortFilename, spoilerRange, subject, threadID, tripcode, uniqueID, _i, _len, _ref; E = Build.h_escape; postID = o.postID, threadID = o.threadID, boardID = o.boardID, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, h_comment = o.h_comment, file = o.file; name || (name = ''); @@ -3215,7 +3215,6 @@ fileSize = $.bytesToString(file.size); fileThumb = file.turl; if (file.isSpoiler) { - fileSize = "Spoiler Image, " + fileSize; if (!isArchived) { fileThumb = "" + h_staticPath + "spoiler"; if (spoilerRange = Build.spoilerRange[boardID]) { @@ -3224,8 +3223,10 @@ fileThumb += '.png'; file.twidth = file.theight = 100; } + shortFilename = 'Spoiler Image'; + } else { + shortFilename = Build.shortFilename(file.name); } - shortFilename = Build.shortFilename(file.name); if (boardID === 'f') { h_imgSrc = ''; } else { @@ -3238,16 +3239,16 @@ } else { h_fileDims = "" + (+file.width) + "x" + (+file.height); } - h_fileInfo = "
" + (E(file.timestamp)) + ""; - h_fileInfo += "-(" + (E(fileSize)) + ", " + h_fileDims; - if (!file.isSpoiler) { - h_fileInfo += ", " + (E(shortFilename)) + ""; - } - h_fileInfo += ')
'; + h_fileInfo = "
"; + h_fileInfo += "File: " + (E(shortFilename)) + " (" + (E(fileSize)) + ", " + h_fileDims + ")"; + h_fileInfo += '
'; h_file = "
" + h_fileInfo + h_imgSrc + "
"; } else { h_file = ''; @@ -12473,7 +12474,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13305,7 +13306,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.62.' + innerHTML: '4chan X has been updated to version 1.7.63.' }); new Notice('info', el, 15); } else { diff --git a/package.json b/package.json index e59bc358c..3a0a34816 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.7.62", + "version": "1.7.63", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X",