mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- A few small tweaks to Zotero.wait()

Browse source 
- Main thread is now accessible from Zotero.mainThread
This commit is contained in:
Dan Stillman 2009-08-09 10:51:12 +00:00
parent a806f09023
commit ebe2cb1871
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
chrome/content/zotero/xpcom/zotero.js
View file

@ -168,6 +168,8 @@ var Zotero = new function(){
_debugLevel = Zotero.Prefs.get('debug.level');
_debugTime = Zotero.Prefs.get('debug.time');
this.mainThread = Components.classes["@mozilla.org/thread-manager;1"].getService().mainThread;
// Load in the extension version from the extension manager
var nsIUpdateItem = Components.interfaces.nsIUpdateItem;
var gExtensionManager =
@ -1050,12 +1052,11 @@ var Zotero = new function(){
/**
* Sleep for a given amount of time, allowing other events on main thread to be processed
*
* @param {Integer} wait Milliseconds to wait
* @param {Integer} ms Milliseconds to wait
*/
this.sleep = function (ms) {
var tm = Components.classes["@mozilla.org/thread-manager;1"].getService();
var mainThread = Zotero.mainThread;
var endTime = Date.now() + ms;
var mainThread = tm.mainThread;
do {
mainThread.processNextEvent(false);
} while (Date.now() < endTime);
@ -1073,22 +1074,22 @@ var Zotero = new function(){
if (!timeout) {
timeout = 50;
}
var tm = Components.classes["@mozilla.org/thread-manager;1"].getService();
var mainThread = Zotero.mainThread;
var endTime = Date.now() + timeout;
var mainThread = tm.mainThread;
var cycles = 0;
var more;
//var cycles = 0;
_waiting = true;
do {
mainThread.processNextEvent(false);
cycles++;
} while (mainThread.hasPendingEvents() && Date.now() < endTime);
more = mainThread.processNextEvent(false);
//cycles++;
} while (more && Date.now() < endTime);
_waiting = false;
//Zotero.debug("Waited " + cycles + " cycles");
return cycles;
return;
};