From 7f949af9057d0ff805e7ed80598436fe853fd939 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 13 Apr 2013 19:04:56 +0200 Subject: [PATCH] Fix QR remembering the spoiler state. --- CHANGELOG.md | 3 +++ src/qr.coffee | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a71bbf936..68212e550 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +- Fix QR remembering the file spoiler state when it shouldn't. +- Fix QR cooldown in Opera. + ### 3.0.4 - *2013-04-11* - More minor fixes. diff --git a/src/qr.coffee b/src/qr.coffee index c67145887..4f7b0c2d4 100644 --- a/src/qr.coffee +++ b/src/qr.coffee @@ -367,8 +367,6 @@ QR = spoiler: $ 'input', el span: el.lastChild - @nodes.spoiler.checked = @spoiler - $.on el, 'click', @select.bind @ $.on @nodes.rm, 'click', (e) => e.stopPropagation(); @rm() $.on @nodes.label, 'click', (e) => e.stopPropagation() @@ -382,7 +380,7 @@ QR = prev = QR.posts[QR.posts.length - 1] QR.posts.push @ - @spoiler = if prev and Conf['Remember Spoiler'] + @nodes.spoiler.checked = @spoiler = if prev and Conf['Remember Spoiler'] prev.spoiler else false @@ -442,6 +440,9 @@ QR = @showFileData() QR.characterCount() save: (input) -> + if input.type is 'checkbox' + @spoiler = input.checked + return {value} = input @[input.dataset.name] = value return if input.nodeName isnt 'TEXTAREA' @@ -455,7 +456,7 @@ QR = return unless @ is QR.selected # Do this in case people use extensions # that do not trigger the `input` event. - for name in ['name', 'email', 'sub', 'com'] + for name in ['name', 'email', 'sub', 'com', 'spoiler'] @save QR.nodes[name] return setFile: (@file) -> @@ -536,7 +537,7 @@ QR = @showFileData() return unless window.URL URL.revokeObjectURL @URL - showFileData: (hide) -> + showFileData: -> if @file QR.nodes.filename.textContent = @filename QR.nodes.filename.title = @filename