suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert r9383 (substantially) to fix unending sync icon spinning

Browse Source
This commit is contained in:
Dan Stillman 2011-06-14 17:46:46 +00:00
parent 3e1335767a
commit 47dbd613ea
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
chrome/content/zotero/xpcom/zotero.js
View File

@ -1523,14 +1523,17 @@ if(appInfo.platformVersion[0] >= 2) {
var timer = Components.classes["@mozilla.org/timer;1"]. var timer = Components.classes["@mozilla.org/timer;1"].
createInstance(Components.interfaces.nsITimer); createInstance(Components.interfaces.nsITimer);
var timerCallback = {"notify":function() { var timerCallback = {"notify":function() {
if(_waiting) { //
// DEBUG: This can result in the callback not being triggered in Fx4+
//
//if(_waiting) {
// if our callback gets called during Zotero.wait(), queue it to be set again // if our callback gets called during Zotero.wait(), queue it to be set again
// when Zotero.wait() completes // when Zotero.wait() completes
_waitTimerCallbacks.push(timerCallback); //_waitTimerCallbacks.push(timerCallback);
} else { //} else {
// otherwise, execute callback function // otherwise, execute callback function
func(); func();
} //}
}} }}
timer.initWithCallback(timerCallback, ms, Components.interfaces.nsITimer.TYPE_ONE_SHOT); timer.initWithCallback(timerCallback, ms, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
} }