zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JS fixes

Browse source
This commit is contained in:
vfedosevich 2013-06-12 17:58:23 +03:00
parent e4f84fb869
commit 7bedf74555
1 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

32
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Scripts/AjaxUtils.js
View file

@ -134,8 +134,9 @@ function ReloadProgressImage()
function GetTaskProgress()
{
requestSimpleService = WebsitePanel.Portal.TaskManager.GetTask(
requestSimpleService = WebsitePanel.Portal.TaskManager.GetTaskWithLogRecords(
_taskId, //params
new Date(1, 2, 3, 4),
OnGetTaskProgressComplete, //Complete event
OnGetTaskProgressTimeout //Timeout event
);
@ -143,17 +144,7 @@ function GetTaskProgress()
function OnGetTaskProgressComplete(task)
{
if(task.LastLogRecord != null)
{
$get('objProgressDialogStep').innerHTML = task.LastLogRecord.Text;
}
// set progress indicator
if(task.IndicatorMaximum > 0)
$get("objProgressDialogProgressBar").style.width = task.IndicatorCurrent / task.IndicatorMaximum * 100 + "%";
if(task.Completed)
{
if (task == null || task.Completed) {
// switch buttons
$get("objProgressDialogCommandButtons").style.display = "none";
$get("objProgressDialogCloseButton").style.display = "block";
@ -166,14 +157,25 @@ function OnGetTaskProgressComplete(task)
// show success message
$get('objProgressDialogStep').innerHTML = _completeMessage;
$get("objProgressDialogProgressBar").style.width = 100 + "%";
return;
}
else
{
if (task.Logs != null) {
$get('objProgressDialogStep').innerHTML = task.Logs.length > 0 ? task.Logs[task.Logs.length - 1].Text : "";
}
// set progress indicator
if (task.IndicatorMaximum > 0)
$get("objProgressDialogProgressBar").style.width = task.IndicatorCurrent / task.IndicatorMaximum * 100 + "%";
$find('ModalPopupProperties')._layout();
//alert(result);
window.setTimeout(GetTaskProgress, 1000);
}
}
function OnGetTaskProgressTimeout(result)
{