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

Merge branch 'Stable' into Beta

Browse Source 
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
This commit is contained in:
ccd0 2014-12-29 11:56:05 -08:00
commit e3c8f46d07
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -25,6 +25,12 @@ The links to individual versions below are to copies of the script with the upda
- Minor bugfixes. - Minor bugfixes.
<!-- v1.9.17.x --> <!-- v1.9.17.x -->
### v1.9.17.11
*2014-12-29* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.11/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.11/builds/4chan-X-noupdate.crx "Chromium version")]
**ccd0**
- Fix index refresh time bug introduced in v1.9.17.0.
### v1.9.17.10 ### v1.9.17.10
*2014-12-26* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.10/builds/4chan-X-noupdate.crx "Chromium version")] *2014-12-26* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.10/builds/4chan-X-noupdate.crx "Chromium version")]

25
src/Miscellaneous/RelativeDates.coffee
View File

@ -1,21 +1,18 @@
RelativeDates = RelativeDates =
INTERVAL: $.MINUTE / 2 INTERVAL: $.MINUTE / 2
init: -> init: ->
return unless Conf['Relative Post Dates'] if (
unless Conf['Relative Date Title'] g.VIEW isnt 'catalog' and Conf['Relative Post Dates'] and !Conf['Relative Date Title'] or
switch g.VIEW g.VIEW is 'index' and Conf['JSON Navigation'] and g.BOARD.ID isnt 'f'
when 'index' )
@flush() @flush()
$.on d, 'visibilitychange', @flush $.on d, 'visibilitychange ThreadUpdate', @flush
when 'thread'
@flush() if Conf['Relative Post Dates']
$.on d, 'visibilitychange ThreadUpdate', @flush if g.VIEW is 'thread' Post.callbacks.push
else name: 'Relative Post Dates'
return cb: @node
Post.callbacks.push
name: 'Relative Post Dates'
cb: @node
node: -> node: ->
dateEl = @nodes.date dateEl = @nodes.date
if Conf['Relative Date Title'] if Conf['Relative Date Title']