This commit is contained in:
James Campos 2011-09-21 00:18:07 -07:00
parent d66a161f70
commit 14f0a68bff
2 changed files with 5 additions and 6 deletions

View File

@ -1443,7 +1443,7 @@
} }
return; return;
data = JSON.parse(data); data = JSON.parse(data);
$.extend($('a.error', QR.qr), data); $.extend($('a.error', qr), data);
tc = data.textContent; tc = data.textContent;
if (tc === 'Error: Duplicate file entry detected.') { if (tc === 'Error: Duplicate file entry detected.') {
if (row) { if (row) {
@ -1458,7 +1458,7 @@
if (row) { if (row) {
$.rm(row); $.rm(row);
} }
if (conf['Persistent QR'] || ((_ref2 = $('#files input', QR.qr)) != null ? _ref2.files.length : void 0)) { if (conf['Persistent QR'] || ((_ref2 = $('#files input', qr)) != null ? _ref2.files.length : void 0)) {
QR.reset(); QR.reset();
} else { } else {
QR.close(); QR.close();

View File

@ -1136,7 +1136,7 @@ QR =
window.location = data if QR.op window.location = data if QR.op
return return
data = JSON.parse data data = JSON.parse data
$.extend $('a.error', QR.qr), data $.extend $('a.error', qr), data
tc = data.textContent tc = data.textContent
if tc is 'Error: Duplicate file entry detected.' if tc is 'Error: Duplicate file entry detected.'
$.rm row if row $.rm row if row
@ -1145,7 +1145,7 @@ QR =
setTimeout QR.submit, 1000 setTimeout QR.submit, 1000
return return
$.rm row if row $.rm row if row
if conf['Persistent QR'] or $('#files input', QR.qr)?.files.length if conf['Persistent QR'] or $('#files input', qr)?.files.length
QR.reset() QR.reset()
else else
QR.close() QR.close()
@ -1207,8 +1207,7 @@ QR =
else if node = $ 'meta' else if node = $ 'meta'
data = node.content.match(/url=(.+)/)[1] data = node.content.match(/url=(.+)/)[1]
parent.postMessage data, '*' parent.postMessage data, '*'
#parent will blank us on message receival; #if we're an iframe, parent will blank us
#if we're not an iframe, we won't get blanked
threading = threading =
init: -> init: ->