gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-06 16:44:12 +01:00
Code Issues Projects Releases Wiki Activity

Make use of callable() in update().

Browse Source
This commit is contained in:
Doug Kearns
2015-06-18 17:38:43 +10:00
parent e31211fcc4
commit cd7a8eeda9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/modules/base.jsm
View File

@@ -715,6 +715,11 @@ function isString(val) {
/** /**
* Returns true if and only if its sole argument may be called * Returns true if and only if its sole argument may be called
* as a function. This includes classes and function objects. * as a function. This includes classes and function objects.
*
* Excludes callable DOM objects: https://bugzil.la/268945
*
* @param {*} val
* @returns {boolean}
*/ */
function callable(val) { function callable(val) {
return typeof val === "function" && !(val instanceof Ci.nsIDOMElement); return typeof val === "function" && !(val instanceof Ci.nsIDOMElement);
@@ -804,7 +809,7 @@ function update(target) {
desc = desc.value.init(k, target) || desc.value; desc = desc.value.init(k, target) || desc.value;
try { try {
if (typeof desc.value === "function" && target.__proto__ && !(desc.value instanceof Ci.nsIDOMElement /* wtf? */)) { if (callable(desc.value) && target.__proto__) {
let func = desc.value.wrapped || desc.value; let func = desc.value.wrapped || desc.value;
if (!func.superapply) { if (!func.superapply) {
func.__defineGetter__("super", function get_super() { func.__defineGetter__("super", function get_super() {