Doni/ModelHandle
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Progress bar with jquery.

Browse Source
This commit is contained in:
kovacsv 2018-11-18 12:47:01 +01:00
parent 597bc06a0d
commit 618505c0c7
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
website/include/importerapp.js
View File

@ -318,10 +318,8 @@ ImporterApp.prototype.GenerateMenu = function ()
ImporterApp.prototype.GenerateError = function (errorMessage)
{
this.viewer.RemoveMeshes ();
var menu = document.getElementById ('menu');
while (menu.lastChild) {
menu.removeChild (menu.lastChild);
}
var menu = $('#menu');
menu.empty ();
this.dialog.Open ({
title : 'Error',
@ -446,14 +444,12 @@ ImporterApp.prototype.ProcessFiles = function (fileList, isUrl)
processorFunc = JSM.ConvertURLListToJsonData;
}
var menu = document.getElementById ('menu');
while (menu.lastChild) {
menu.removeChild (menu.lastChild);
}
var menu = $('#menu');
menu.empty ();
if (isUrl) {
menu.innerHTML = 'Downloading files...';
menu.html ('Downloading files...');
} else {
menu.innerHTML = 'Loading files...';
menu.html ('Loading files...');
}
processorFunc (userFiles, {
@ -464,8 +460,7 @@ ImporterApp.prototype.ProcessFiles = function (fileList, isUrl)
onReady : function (fileNames, jsonData) {
myThis.fileNames = fileNames;
myThis.viewer.SetJsonData (jsonData);
var menu = document.getElementById ('menu');
menu.empty ();
var progressBar = new ImporterProgressBar (menu);
myThis.JsonLoaded (progressBar);
}

17
website/include/importermenu.js
View File

@ -143,9 +143,6 @@ ExtensionButtons.prototype.GetButtonsDiv = function ()
ImporterProgressBar = function (parent)
{
this.parent = parent;
while (this.parent.lastChild) {
this.parent.removeChild (this.parent.lastChild);
}
this.borderDiv = null;
this.contentDiv = null;
this.maxCount = null;
@ -154,17 +151,11 @@ ImporterProgressBar = function (parent)
ImporterProgressBar.prototype.Init = function (maxCount)
{
this.borderDiv = document.createElement ('div');
this.borderDiv.className = 'progressbarborder';
this.borderDiv = $('<div>').addClass ('progressbarborder').appendTo (this.parent);
this.contentDiv = $('<div>').addClass ('progressbarcontent').appendTo (this.borderDiv);
this.contentDiv = document.createElement ('div');
this.contentDiv.className = 'progressbarcontent';
this.borderDiv.appendChild (this.contentDiv);
this.parent.appendChild (this.borderDiv);
this.maxCount = maxCount;
this.maxWidth = this.borderDiv.offsetWidth;
this.maxWidth = this.borderDiv.width ();
this.Step (0);
};
@ -175,5 +166,5 @@ ImporterProgressBar.prototype.Step = function (count)
if (count == this.maxCount) {
width = this.maxWidth - 2;
}
this.contentDiv.style.width = width + 'px';
this.contentDiv.width (width);
};