stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-27 18:24:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expire completed uploads and introduce a text message that says how

Browse Source 
many photos have been uploaded successfully.  This is to pave the way
for retry code later on.
This commit is contained in:
Bharat Mediratta
2010-08-31 00:03:46 -07:00
parent 5568ab24de
commit db769b76ab
4 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/views/form_uploadify.html.php
+25 -7
View File
@@ -3,7 +3,24 @@
<script type="text/javascript" src="<?= url::file("lib/uploadify/jquery.uploadify.min.js") ?>"></script>
<script type="text/javascript">
<? $flash_minimum_version = "9.0.24" ?>
var success_count = 0;
var error_count = 0;
var updating = 0;
$("#g-add-photos-canvas").ready(function () {
var update_status = function() {
if (updating) {
// poor man's mutex
setTimeout(function() { update_status(); }, 500);
}
updating = 1;
$.get("<?= url::site("uploader/status/_S/_E") ?>"
.replace("_S", success_count).replace("_E", error_count),
function(data) {
$("#g-add-photos-status-message").html(data);
updating = 0;
});
};
if (swfobject.hasFlashPlayerVersion("<?= $flash_minimum_version ?>")) {
$("#g-uploadify").uploadify({
width: 150,
@@ -40,13 +57,12 @@
onComplete: function(event, queueID, fileObj, response, data) {
var re = /^error: (.*)$/i;
var msg = re.exec(response);
if (msg) {
$("#g-add-photos-status ul").append(
"<li class=\"g-error\">" + fileObj.name + " - " + msg[1] + "</li>");
} else {
$("#g-add-photos-status ul").append(
"<li class=\"g-success\">" + fileObj.name + " - " + <?= t("Completed")->for_js() ?> + "</li>");
}
$("#g-add-photos-status ul").append(
"<li id=\"q" + queueID + "\" class=\"g-success\">" + fileObj.name + " - " +
<?= t("Completed")->for_js() ?> + "</li>");
setTimeout(function() { $("#q" + queueID).slideUp("slow") }, 5000);
success_count++;
update_status();
return true;
},
onError: function(event, queueID, fileObj, errorObj) {
@@ -73,6 +89,8 @@
$("#g-add-photos-status ul").append(
"<li class=\"g-error\">" + fileObj.name + msg + "</li>");
$("#g-uploadify" + queueID).remove();
error_count++;
update_status();
},
onSelect: function(event) {
if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {