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

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2015-08-26 21:08:59 -07:00
commit e5fd028582
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -22,6 +22,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.9 ### v1.11.9
**v1.11.9.5** *(2015-08-26)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.5/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix regression from v1.11.8.0 causing delete link not to work when Cooldown is off.
**v1.11.9.4** *(2015-08-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.4/builds/4chan-X-noupdate.crx "Chromium version")] **v1.11.9.4** *(2015-08-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.4/builds/4chan-X-noupdate.crx "Chromium version")]
- Archive list update: desustorage.org -> archive.horse. - Archive list update: desustorage.org -> archive.horse.

2
src/Menu/DeleteLink.coffee
View File

@ -95,7 +95,7 @@ DeleteLink =
else if msg = resDoc.getElementById 'errmsg' # error! else if msg = resDoc.getElementById 'errmsg' # error!
new Notice 'warning', msg.textContent, 20 new Notice 'warning', msg.textContent, 20
$.on link, 'click', DeleteLink.toggle if post.fullID is DeleteLink.post.fullID $.on link, 'click', DeleteLink.toggle if post.fullID is DeleteLink.post.fullID
if /\bwait\b/i.test msg.textContent if Conf['Quick Reply'] and Conf['Cooldown'] and /\bwait\b/i.test(msg.textContent)
DeleteLink.cooldown.start post, 5 DeleteLink.cooldown.start post, 5
DeleteLink.auto[+fileOnly][post.fullID] = true DeleteLink.auto[+fileOnly][post.fullID] = true
DeleteLink.nodes.links[+fileOnly].textContent = DeleteLink.linkText fileOnly DeleteLink.nodes.links[+fileOnly].textContent = DeleteLink.linkText fileOnly

1
src/Posting/QR.cooldown.coffee
View File

@ -70,6 +70,7 @@ QR.cooldown =
QR.cooldown.save [post.board.ID] QR.cooldown.save [post.board.ID]
secondsDeletion: (post) -> secondsDeletion: (post) ->
return 0 unless Conf['Quick Reply'] and Conf['Cooldown']
cooldowns = QR.cooldown.data[post.board.ID] or {} cooldowns = QR.cooldown.data[post.board.ID] or {}
for start, cooldown of cooldowns for start, cooldown of cooldowns
if !cooldown.delay? and cooldown.threadID is post.thread.ID and cooldown.postID is post.ID if !cooldown.delay? and cooldown.threadID is post.thread.ID and cooldown.postID is post.ID