Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Browse Source 
Conflicts:
	Gruntfile.js
	src/features.coffee
	src/main.coffee
This commit is contained in:
Zixaphir 2013-04-16 18:03:14 -07:00
commit 599eaef3df
12 changed files with 70 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
### 3.1.4 - *2013-04-17*
- Fix QR remembering the file spoiler state when it shouldn't, for real this time.
- Fix inputs in the `Rice` tab being empty when `Custom Board Navigation` is disabled.
### 3.1.3 - *2013-04-16*
- Fix Chrome freezing when switching from the `Filter` tab to another tab in the settings.

41
Gruntfile.coffee
View File

@ -25,7 +25,7 @@ module.exports = (grunt) ->
'src/databoard.coffee'
'src/main.coffee'
]
dest: 'tmp/script.coffee'
dest: 'tmp-<%= pkg.type %>/script.coffee'
crx:
options: concatOptions
@ -33,7 +33,7 @@ module.exports = (grunt) ->
'builds/crx/manifest.json': 'src/manifest.json'
'builds/crx/script.js': [
'src/banner.js'
'tmp/script.js'
'tmp-<%= pkg.type %>/script.js'
]
userjs:
@ -41,7 +41,7 @@ module.exports = (grunt) ->
src: [
'src/metadata.js'
'src/banner.js'
'tmp/script.js'
'tmp-<%= pkg.type %>/script.js'
]
dest: 'builds/<%= pkg.name %>.js'
@ -52,7 +52,7 @@ module.exports = (grunt) ->
'builds/<%= pkg.name %>.user.js': [
'src/metadata.js'
'src/banner.js'
'tmp/script.js'
'tmp-<%= pkg.type %>/script.js'
]
copy:
@ -64,8 +64,15 @@ module.exports = (grunt) ->
coffee:
script:
src: 'tmp/script.coffee'
dest: 'tmp/script.js'
src: 'tmp-<%= pkg.type %>/script.coffee'
dest: 'tmp-<%= pkg.type %>/script.js'
concurrent:
build: [
'build-crx'
'build-userjs'
'build-userscript'
]
exec:
commit:
@ -87,6 +94,7 @@ module.exports = (grunt) ->
all:
options:
interrupt: true
nospawn: true
files: [
'Gruntfile.coffee'
'package.json'
@ -108,10 +116,13 @@ module.exports = (grunt) ->
src: '**'
clean:
builds: 'builds'
tmp: 'tmp'
builds: 'builds'
tmpcrx: 'tmp-crx'
tmpuserjs: 'tmp-userjs'
tmpuserscript: 'tmp-userscript'
grunt.loadNpmTasks 'grunt-bump'
grunt.loadNpmTasks 'grunt-concurrent'
grunt.loadNpmTasks 'grunt-contrib-clean'
grunt.loadNpmTasks 'grunt-contrib-coffee'
grunt.loadNpmTasks 'grunt-contrib-compress'
@ -120,16 +131,16 @@ module.exports = (grunt) ->
grunt.loadNpmTasks 'grunt-contrib-watch'
grunt.loadNpmTasks 'grunt-exec'
grunt.registerTask 'default', ['build']
grunt.registerTask 'default', [
'build'
]
grunt.registerTask 'set-build', 'Set the build type variable', (type) ->
pkg.type = type;
grunt.log.ok 'pkg.type = %s', type
grunt.registerTask 'build', [
'build-crx'
'build-userjs'
'build-userscript'
'concurrent:build'
]
grunt.registerTask 'build-crx', [
@ -138,7 +149,7 @@ module.exports = (grunt) ->
'coffee:script'
'concat:crx'
'copy:crx'
'clean:tmp'
'clean:tmpcrx'
]
grunt.registerTask 'build-userjs', [
@ -146,7 +157,7 @@ module.exports = (grunt) ->
'concat:coffee'
'coffee:script'
'concat:userjs'
'clean:tmp'
'clean:tmpuserjs'
]
grunt.registerTask 'build-userscript', [
@ -154,7 +165,7 @@ module.exports = (grunt) ->
'concat:coffee'
'coffee:script'
'concat:userscript'
'clean:tmp'
'clean:tmpuserscript'
]
grunt.registerTask 'release', [

26
builds/4chan-X.js
View File

File diff suppressed because one or more lines are too long

2
builds/4chan-X.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 3.1.3
// @version 3.1.4
// @namespace 4chan-X
// @description Cross-browser extension for productive lurking on 4chan.
// @copyright 2009-2011 James Campos <james.r.campos@gmail.com>

26
builds/4chan-X.user.js
View File

File diff suppressed because one or more lines are too long

BIN
builds/crx.crx
View File

Binary file not shown.

2
builds/crx/manifest.json
View File

@ -1,6 +1,6 @@
{
"name": "4chan X",
"version": "3.1.3",
"version": "3.1.4",
"manifest_version": 2,
"description": "Cross-browser extension for productive lurking on 4chan.",
"icons": {

24
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

3
css/style.css
View File

@ -366,8 +366,7 @@ a[href="javascript:;"] {
:root.hide-announcement #globalMessage {
display: none;
}
a.hide-announcement,
a.show-announcement {
a.hide-announcement {
float: left;
}

3
package.json
View File

@ -1,6 +1,6 @@
{
"name": "4chan-X",
"version": "3.1.3",
"version": "3.1.4",
"description": "Cross-browser extension for productive lurking on 4chan.",
"meta": {
"name": "4chan X",
@ -18,6 +18,7 @@
"devDependencies": {
"grunt": "~0.4.1",
"grunt-bump": "~0.0.0",
"grunt-concurrent": "~0.1.1",
"grunt-contrib-clean": "~0.4.0",
"grunt-contrib-coffee": "~0.6.6",
"grunt-contrib-compress": "~0.4.10",

7
src/features.coffee
View File

@ -100,7 +100,9 @@ Header =
fullBoardList.hidden = false
generateBoardList: (text) ->
list = $ '#custom-board-list', Header.nav
unless list = $ '#custom-board-list', Header.nav
# init'd with the custom board list disabled.
return
$.rmAll list
return unless text
as = $$('#full-board-list a', Header.nav)[0...-2] # ignore the Settings and Home links
@ -317,7 +319,6 @@ Settings =
# and out of date extension on this device.
prev = previous.match(/\d+/g).map Number
curr = g.VERSION.match(/\d+/g).map Number
return unless prev[0] <= curr[0] and prev[1] <= curr[1] and prev[2] <= curr[2]
changelog = '<%= meta.repo %>blob/<%= meta.mainBranch %>/CHANGELOG.md'
el = $.el 'span',
@ -1915,7 +1916,7 @@ Keybinds =
when Conf['Open settings']
Settings.open()
when Conf['Close']
if $.id 'fourchanx-settings'
if Settings.dialog
Settings.close()
else if (notifications = $$ '.notification').length
for notification in notifications

4
src/qr.coffee
View File

@ -83,8 +83,6 @@ QR =
QR.posts[0].rm()
QR.cooldown.auto = false
QR.status()
if !Conf['Remember Spoiler'] and QR.nodes.spoiler.checked
QR.nodes.spoiler.click()
focusin: ->
$.addClass QR.nodes.el, 'has-focus'
focusout: ->
@ -569,7 +567,7 @@ QR =
if @file
QR.nodes.filename.textContent = @filename
QR.nodes.filename.title = @filename
QR.nodes.spoiler.checked = @spoiler if QR.spoiler
QR.nodes.spoiler.checked = @spoiler
$.addClass QR.nodes.fileSubmit, 'has-file'
else
$.rmClass QR.nodes.fileSubmit, 'has-file'