diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a5efcc83..75deeb99e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ The links to individual versions below are to copies of the script with the upda - Add option `Force Noscript Captcha` to use the non-Javascript version of Recaptcha and an interface similar to the old Recaptcha. Also use this version of the captcha if Javascript is disabled on the page (4chan X can be used this way in Greasemonkey 2.x). +### v1.9.15.20 +*2014-12-14* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.20/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.20/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Bugfixes. + ### v1.9.15.19 *2014-12-12* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.19/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.19/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 43a8425db..80ed3e76d 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -215,6 +215,41 @@ module.exports = (grunt) -> options: template: 'template.jst' + jshint: + options: + undef: true + eqnull: true + expr: true + shadow: true + sub: true + scripturl: true + browser: true + devel: true + nonstandard: true + # XXX Temporarily suppress lots of existing warnings until we fix them. + '-W018': true + '-W027': true + '-W044': true + '-W053': true + '-W084': true + '-W058': true + '-W083': true + '-W093': true + globals: + Notification: true + webkitNotifications: true + HTMLDocument: true + MediaError: true + GM_getValue: true + GM_setValue: true + GM_deleteValue: true + GM_openInTab: true + GM_info: true + GM_xmlhttpRequest: true + cloneInto: true + chrome: true + script: 'tmp-<%= pkg.type %>/*.js' + require('load-grunt-tasks') grunt grunt.registerTask 'default', [ @@ -251,6 +286,7 @@ module.exports = (grunt) -> 'concat:coffee' 'coffee:script' 'coffee:eventPage' + 'jshint:script' 'set-channel:stable' 'build-crx-channel' 'set-channel:beta' @@ -274,6 +310,7 @@ module.exports = (grunt) -> 'set-build:userscript' 'concat:coffee' 'coffee:script' + 'jshint:script' 'set-channel:stable' 'concat:userscript' 'set-channel:beta' diff --git a/package.json b/package.json index 42e983b34..21b0476f9 100755 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "grunt-contrib-compress": "0.12.0", "grunt-contrib-concat": "0.5.0", "grunt-contrib-copy": "0.7.0", + "grunt-contrib-jshint": "0.10.0", "grunt-contrib-watch": "0.6.1", "grunt-crx": "0.3.4", "grunt-markdown": "0.6.1", @@ -69,4 +70,4 @@ "engines": { "node": ">=0.10" } -} \ No newline at end of file +} diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee index d444763f6..fbaa32de0 100755 --- a/src/Linkification/Linkify.coffee +++ b/src/Linkification/Linkify.coffee @@ -317,7 +317,7 @@ Linkify = embed = file break break if embed - return div.textContent = "ERROR: Not a valid filetype" unless embed + return el.textContent = "ERROR: Not a valid filetype" unless embed switch embed.type when 'video/mp4', 'video/webm', 'video/ogv' $.extend el, <%= html('') %> diff --git a/src/Menu/DownloadLink.coffee b/src/Menu/DownloadLink.coffee index 053b9a81b..3c33e7e84 100755 --- a/src/Menu/DownloadLink.coffee +++ b/src/Menu/DownloadLink.coffee @@ -15,7 +15,7 @@ DownloadLink = @href = URL.createObjectURL blob @click() else - new Notice 'error', "Could not download #{file.URL}", 30 + new Notice 'error', "Could not download #{@href}", 30 Menu.menu.addEntry el: a