|
@@ -69,7 +69,6 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
|
|
var dateStart = new Date();
|
|
var dateStart = new Date();
|
|
var wasEverActive = false;
|
|
var wasEverActive = false;
|
|
var parentProgressbar = progressbarContainer.parentNode;
|
|
var parentProgressbar = progressbarContainer.parentNode;
|
|
- var parentGallery = gallery ? gallery.parentNode : null;
|
|
|
|
|
|
|
|
var divProgress = document.createElement('div');
|
|
var divProgress = document.createElement('div');
|
|
divProgress.className = 'progressDiv';
|
|
divProgress.className = 'progressDiv';
|
|
@@ -80,16 +79,16 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
|
|
divProgress.appendChild(divInner);
|
|
divProgress.appendChild(divInner);
|
|
parentProgressbar.insertBefore(divProgress, progressbarContainer);
|
|
parentProgressbar.insertBefore(divProgress, progressbarContainer);
|
|
|
|
|
|
- if (parentGallery) {
|
|
|
|
|
|
+ if (gallery) {
|
|
var livePreview = document.createElement('div');
|
|
var livePreview = document.createElement('div');
|
|
livePreview.className = 'livePreview';
|
|
livePreview.className = 'livePreview';
|
|
- parentGallery.insertBefore(livePreview, gallery);
|
|
|
|
|
|
+ gallery.insertBefore(livePreview, gallery.firstElementChild);
|
|
}
|
|
}
|
|
|
|
|
|
var removeProgressBar = function() {
|
|
var removeProgressBar = function() {
|
|
setTitle("");
|
|
setTitle("");
|
|
parentProgressbar.removeChild(divProgress);
|
|
parentProgressbar.removeChild(divProgress);
|
|
- if (parentGallery) parentGallery.removeChild(livePreview);
|
|
|
|
|
|
+ if (gallery) gallery.removeChild(livePreview);
|
|
atEnd();
|
|
atEnd();
|
|
};
|
|
};
|
|
|
|
|
|
@@ -100,12 +99,6 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- var rect = progressbarContainer.getBoundingClientRect();
|
|
|
|
-
|
|
|
|
- if (rect.width) {
|
|
|
|
- divProgress.style.width = rect.width + "px";
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
let progressText = "";
|
|
let progressText = "";
|
|
|
|
|
|
divInner.style.width = ((res.progress || 0) * 100.0) + '%';
|
|
divInner.style.width = ((res.progress || 0) * 100.0) + '%';
|
|
@@ -151,17 +144,11 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
|
|
}, function() {
|
|
}, function() {
|
|
removeProgressBar();
|
|
removeProgressBar();
|
|
});
|
|
});
|
|
- }
|
|
|
|
|
|
+ };
|
|
|
|
|
|
var funLivePreview = function(id_task, id_live_preview) {
|
|
var funLivePreview = function(id_task, id_live_preview) {
|
|
request("./internal/progress", {id_task: id_task, id_live_preview: id_live_preview}, function(res) {
|
|
request("./internal/progress", {id_task: id_task, id_live_preview: id_live_preview}, function(res) {
|
|
if (res.live_preview && gallery) {
|
|
if (res.live_preview && gallery) {
|
|
- rect = gallery.getBoundingClientRect();
|
|
|
|
- if (rect.width) {
|
|
|
|
- livePreview.style.width = rect.width + "px";
|
|
|
|
- livePreview.style.height = rect.height + "px";
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
var img = new Image();
|
|
var img = new Image();
|
|
img.onload = function() {
|
|
img.onload = function() {
|
|
livePreview.appendChild(img);
|
|
livePreview.appendChild(img);
|