stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'timer' of git://github.com/saneyuki/treestyletab

Browse Source 
Conflicts:
	install.rdf
This commit is contained in:
YUKI Hiroshi 2013-11-05 10:56:05 +09:00
commit e7637b55dc
4 changed files with 4 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install.rdf
View File

@ -180,8 +180,8 @@
<em:targetApplication>
<RDF:Description em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
em:minVersion="10.0"
em:maxVersion="27.0a1" />
em:minVersion="24.0"
em:maxVersion="28.0a1" />
</em:targetApplication>
</RDF:Description>
</RDF:RDF>

8
modules/base.js
View File

@ -41,6 +41,7 @@ const Cu = Components.utils;
Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import('resource://gre/modules/Services.jsm');
Cu.import("resource://gre/modules/Timer.jsm");
Cu.import('resource://treestyletab-modules/constants.js');
XPCOMUtils.defineLazyGetter(this, 'window', function() {
@ -51,11 +52,6 @@ XPCOMUtils.defineLazyGetter(this, 'prefs', function() {
Cu.import('resource://treestyletab-modules/lib/prefs.js');
return window['piro.sakura.ne.jp'].prefs;
});
XPCOMUtils.defineLazyGetter(this, 'jstimer', function() {
var jstimer = {};
Cu.import('resource://treestyletab-modules/lib/jstimer.jsm', jstimer);
return jstimer;
});
XPCOMUtils.defineLazyGetter(this, 'extensions', function() {
Cu.import('resource://treestyletab-modules/lib/extensions.js', {});
return window['piro.sakura.ne.jp'].extensions;
@ -544,7 +540,7 @@ var TreeStyleTabBase = {
var done = false;
var listener = function(aEvent) {
jstimer.setTimeout(function() {
setTimeout(function() {
done = true;
}, delay || 0);
target.removeEventListener(type, listener, false);

4
modules/lib/animationManager.js
View File

@ -25,8 +25,6 @@
http://github.com/piroor/fxaddonlibs/blob/master/animationManager.js
*/
/* To work as a JS Code Module (*require jstimer.jsm)
http://github.com/piroor/fxaddonlibs/blob/master/jstimer.jsm */
if (typeof window == 'undefined' ||
(window && typeof window.constructor == 'function')) {
this.EXPORTED_SYMBOLS = ['animationManager'];
@ -41,8 +39,6 @@ if (typeof window == 'undefined' ||
catch(e) {
window = {};
}
if (!('setInterval' in window))
Components.utils.import('resource://treestyletab-modules/lib/jstimer.jsm', window);
}
(function() {

162
modules/lib/jstimer.jsm
View File

@ -1,162 +0,0 @@
/*
JavaScript Timer Library
Usage:
var namespace = {};
Components.utils.import('resource://foo-modules/jstimer.jsm', namespace);
var callback = function(aMessage) { alert(aMessage); };
var timeout = namespace.setTimeout(callback, 1000, 'OK');
namespace.clearTimeout(timeout);
var interval = namespace.setInterval(callback, 1000, 'OK');
namespace.clearInterval(interval);
license: The MIT License, Copyright (c) 2010 YUKI "Piro" Hiroshi
http://www.cozmixng.org/repos/piro/fx3-compatibility-lib/trunk/license.txt
original:
http://www.cozmixng.org/repos/piro/fx3-compatibility-lib/trunk/jstimer.jsm
http://www.cozmixng.org/repos/piro/fx3-compatibility-lib/trunk/jstimer.test.js
*/
var Cc = Components.classes;
var Ci = Components.interfaces;
var EXPORTED_SYMBOLS = [
'setTimeout',
'clearTimeout',
'setInterval',
'clearInterval'
];
function setTimeout()
{
var args = Array.slice(arguments);
var callback = args.shift();
var timeout = args.shift();
if (typeof callback != 'string') {
let source = callback;
callback = function() { source.apply(getGlobal(), args); };
callback.source = source;
}
return (new Timer(
callback,
timeout,
Ci.nsITimer.TYPE_ONE_SHOT,
getOwnerWindowFromCaller(arguments.callee.caller)
)).id;
}
function clearTimeout(aId)
{
Timer.cancel(aId);
}
function setInterval()
{
var args = Array.slice(arguments);
var callback = args.shift();
var interval = args.shift();
if (typeof callback != 'string') {
let source = callback;
callback = function() { source.apply(getGlobal(), args); };
callback.source = source;
}
return (new Timer(
callback,
interval,
Ci.nsITimer.TYPE_REPEATING_SLACK,
getOwnerWindowFromCaller(arguments.callee.caller)
)).id;
}
function clearInterval(aId)
{
Timer.cancel(aId);
}
function Timer(aCallback, aTime, aType, aOwner) {
this.finished = false;
this.callback = aCallback;
this.type = aType;
this.owner = aOwner;
this.init(aTime);
Timer.instances[this.id] = this;
}
Timer.prototype = {
init : function(aTime, aType)
{
this.id = parseInt(Math.random() * 65000)
this.timer = Cc['@mozilla.org/timer;1']
.createInstance(Ci.nsITimer);
this.timer.init(this, aTime, this.type);
},
cancel : function()
{
if (!this.timer) return;
this.timer.cancel();
delete this.timer;
delete this.callback;
this.finished = true;
delete Timer.instances[this.id];
},
observe : function(aSubject, aTopic, aData)
{
if (aTopic != 'timer-callback') return;
this.notify(aSubject);
},
notify : function(aTimer)
{
if (this.owner && this.owner.closed) {
dump('jstimer.jsm:'+
' timer is stopped because the owner window was closed.\n'+
' type: '+(this.type == Ci.nsITimer.TYPE_ONE_SHOT ? 'TYPE_ONE_SHOT' : 'TYPE_REPEATING_SLACK' )+'\n'+
' callback: '+(this.callback.source || this.callback)+'\n');
this.cancel();
return;
}
if (typeof this.callback == 'function')
this.callback();
else
evalInSandbox(this.callback);
if (this.type == Ci.nsITimer.TYPE_ONE_SHOT)
this.cancel();
}
};
Timer.instances = {};
Timer.cancel = function(aId) {
var timer = this.getInstanceById(aId);
if (timer)
timer.cancel();
};
Timer.getInstanceById = function(aId) {
return this.instances[aId] || null ;
};
function evalInSandbox(aCode, aSandboxOwner)
{
var sandbox = new Components.utils.Sandbox(aSandboxOwner || 'about:blank');
return Components.utils.evalInSandbox(aCode, sandbox);
}
function getGlobal()
{
return (function() { return this; })();
}
function getOwnerWindowFromCaller(aCaller)
{
try {
var global = aCaller.valueOf.call(null);
if (global && global instanceof Ci.nsIDOMWindow)
return global;
}
catch(e) {
}
return null;
}