github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-01 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue 112: PhoneGap.Channel: replace instanceof Function with typeof === 'Function'

Browse Source
This commit is contained in:
Bryce Curtis 2011-06-15 13:01:03 -05:00 committed by Joe Bowser
parent d35e8cd44b
commit 80e66d87a9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
framework/assets/js/phonegap.js.base
View File

@ -99,7 +99,7 @@ PhoneGap.Channel.prototype.subscribe = function(f, c, g) {
if (f === null) { return; } if (f === null) { return; }
var func = f; var func = f;
if (typeof c === "object" && f instanceof Function) { func = PhoneGap.close(c, f); } if (typeof c === "object" && typeof f === "function") { func = PhoneGap.close(c, f); }
g = g || func.observer_guid || f.observer_guid || this.guid++; g = g || func.observer_guid || f.observer_guid || this.guid++;
func.observer_guid = g; func.observer_guid = g;
@ -120,7 +120,7 @@ PhoneGap.Channel.prototype.subscribeOnce = function(f, c) {
_this.unsubscribe(g); _this.unsubscribe(g);
}; };
if (this.fired) { if (this.fired) {
if (typeof c === "object" && f instanceof Function) { f = PhoneGap.close(c, f); } if (typeof c === "object" && typeof f === "function") { f = PhoneGap.close(c, f); }
f.apply(this, this.fireArgs); f.apply(this, this.fireArgs);
} else { } else {
g = this.subscribe(m); g = this.subscribe(m);
@ -132,7 +132,7 @@ PhoneGap.Channel.prototype.subscribeOnce = function(f, c) {
* Unsubscribes the function with the given guid from the channel. * Unsubscribes the function with the given guid from the channel.
*/ */
PhoneGap.Channel.prototype.unsubscribe = function(g) { PhoneGap.Channel.prototype.unsubscribe = function(g) {
if (g instanceof Function) { g = g.observer_guid; } if (typeof g === "function") { g = g.observer_guid; }
this.handlers[g] = null; this.handlers[g] = null;
delete this.handlers[g]; delete this.handlers[g];
}; };
@ -147,7 +147,7 @@ PhoneGap.Channel.prototype.fire = function(e) {
for (item in this.handlers) { for (item in this.handlers) {
if (this.handlers.hasOwnProperty(item)) { if (this.handlers.hasOwnProperty(item)) {
handler = this.handlers[item]; handler = this.handlers[item];
if (handler instanceof Function) { if (typeof handler === "function") {
rv = (handler.apply(this, arguments) === false); rv = (handler.apply(this, arguments) === false);
fail = fail || rv; fail = fail || rv;
} }
@ -510,7 +510,7 @@ PhoneGap.clone = function(obj) {
return retVal; return retVal;
} }
if (obj instanceof Function) { if (typeof obj === "function") {
return obj; return obj;
} }