Commit 8d9f9d20 authored by marc duez's avatar marc duez

model.js : updateIcon also track waiting screen

parent 8e3cb6f5
...@@ -77,6 +77,7 @@ Model.prototype = { ...@@ -77,6 +77,7 @@ Model.prototype = {
build: function () { build: function () {
var self =this; var self =this;
this.waiting_screen_is_on = false;
this.waiting_screen = document.createElement("div"); this.waiting_screen = document.createElement("div");
this.waiting_screen.className = "waiting_screen"; this.waiting_screen.className = "waiting_screen";
...@@ -1304,10 +1305,15 @@ changeAlleleNotation: function(alleleNotation) { ...@@ -1304,10 +1305,15 @@ changeAlleleNotation: function(alleleNotation) {
* return true if a view has not finished an update * return true if a view has not finished an update
*/ */
updateIsPending:function(){ updateIsPending:function(){
for (var i = 0; i < this.view.length; i++) { //check if a view is waiting an update
for (var i = 0; i < this.view.length; i++)
if (this.view[i].updateIsPending()) if (this.view[i].updateIsPending())
return true; return true;
}
//check waiting screen
if (this.waiting_screen_is_on)
return true;
return false; return false;
}, },
...@@ -2629,12 +2635,16 @@ changeAlleleNotation: function(alleleNotation) { ...@@ -2629,12 +2635,16 @@ changeAlleleNotation: function(alleleNotation) {
this.waiting_screen.style.display = "block"; this.waiting_screen.style.display = "block";
this.waiting_msg.innerHTML= text; this.waiting_msg.innerHTML= text;
if (typeof shortcut != 'undefined') shortcut.on = false; if (typeof shortcut != 'undefined') shortcut.on = false;
this.waiting_screen_is_on = true;
this.updateIcon();
}, },
resume: function(){ resume: function(){
this.waiting_screen.style.display = "none"; this.waiting_screen.style.display = "none";
this.waiting_msg.removeAllChildren(); this.waiting_msg.removeAllChildren();
if (typeof shortcut != 'undefined') shortcut.on = true; if (typeof shortcut != 'undefined') shortcut.on = true;
this.waiting_screen_is_on = false;
this.updateIcon();
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment