Open the QR asynchronously if Persistent QR is enabled.

This commit is contained in:
Nicolas Stepien 2012-03-07 20:35:43 +01:00
parent 5fd43f180b
commit 9c187f9427
2 changed files with 7 additions and 4 deletions

View File

@ -1313,8 +1313,10 @@
return $.rm(script); return $.rm(script);
}); });
if (conf['Persistent QR']) { if (conf['Persistent QR']) {
qr.dialog(); setTimeout(function() {
if (conf['Auto Hide QR']) qr.hide(); qr.dialog();
if (conf['Auto Hide QR']) return qr.hide();
});
} }
$.on(d, 'dragover', qr.dragOver); $.on(d, 'dragover', qr.dragOver);
$.on(d, 'drop', qr.dropFile); $.on(d, 'drop', qr.dropFile);

View File

@ -1068,8 +1068,9 @@ qr =
$.rm script $.rm script
if conf['Persistent QR'] if conf['Persistent QR']
qr.dialog() setTimeout ->
qr.hide() if conf['Auto Hide QR'] qr.dialog()
qr.hide() if conf['Auto Hide QR']
$.on d, 'dragover', qr.dragOver $.on d, 'dragover', qr.dragOver
$.on d, 'drop', qr.dropFile $.on d, 'drop', qr.dropFile
$.on d, 'dragstart', qr.drag $.on d, 'dragstart', qr.drag