mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-01-09 07:14:16 +01:00
Merge default.
--HG-- branch : key-processing
This commit is contained in:
@@ -23,20 +23,20 @@ if (typeof XPCSafeJSObjectWrapper === "undefined")
|
|||||||
this.XPCSafeJSObjectWrapper = XPCNativeWrapper;
|
this.XPCSafeJSObjectWrapper = XPCNativeWrapper;
|
||||||
|
|
||||||
if (!XPCNativeWrapper.unwrap)
|
if (!XPCNativeWrapper.unwrap)
|
||||||
XPCNativeWrapper.unwrap = function (obj) {
|
XPCNativeWrapper.unwrap = function unwrap(obj) {
|
||||||
if (hasOwnProperty.call(obj, "wrappedJSObject"))
|
if (hasOwnProperty.call(obj, "wrappedJSObject"))
|
||||||
return obj.wrappedJSObject;
|
return obj.wrappedJSObject;
|
||||||
return obj;
|
return obj;
|
||||||
};
|
};
|
||||||
if (!Object.create)
|
if (!Object.create)
|
||||||
Object.create = function (proto, props) {
|
Object.create = function create(proto, props) {
|
||||||
let obj = { __proto__: proto };
|
let obj = { __proto__: proto };
|
||||||
for (let k in properties(props || {}))
|
for (let k in properties(props || {}))
|
||||||
Object.defineProperty(obj, k, props[k]);
|
Object.defineProperty(obj, k, props[k]);
|
||||||
return obj;
|
return obj;
|
||||||
};
|
};
|
||||||
if (!Object.defineProperty)
|
if (!Object.defineProperty)
|
||||||
Object.defineProperty = function (obj, prop, desc) {
|
Object.defineProperty = function defineProperty(obj, prop, desc) {
|
||||||
let value = desc.value;
|
let value = desc.value;
|
||||||
if ("value" in desc)
|
if ("value" in desc)
|
||||||
if (desc.writable && !objproto.__lookupGetter__.call(obj, prop)
|
if (desc.writable && !objproto.__lookupGetter__.call(obj, prop)
|
||||||
@@ -56,6 +56,11 @@ if (!Object.defineProperty)
|
|||||||
if ("set" in desc)
|
if ("set" in desc)
|
||||||
objproto.__defineSetter__.call(obj, prop, desc.set);
|
objproto.__defineSetter__.call(obj, prop, desc.set);
|
||||||
};
|
};
|
||||||
|
if (!Object.defineProperties)
|
||||||
|
Object.defineProperties = function defineProperties(obj, props) {
|
||||||
|
for (let [k, v] in Iterator(props))
|
||||||
|
Object.defineProperty(obj, k, v);
|
||||||
|
}
|
||||||
if (!Object.getOwnPropertyDescriptor)
|
if (!Object.getOwnPropertyDescriptor)
|
||||||
Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(obj, prop) {
|
Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(obj, prop) {
|
||||||
if (!hasOwnProperty.call(obj, prop))
|
if (!hasOwnProperty.call(obj, prop))
|
||||||
@@ -91,9 +96,9 @@ if (!Object.getOwnPropertyNames)
|
|||||||
return res;
|
return res;
|
||||||
};
|
};
|
||||||
if (!Object.getPrototypeOf)
|
if (!Object.getPrototypeOf)
|
||||||
Object.getPrototypeOf = function (obj) obj.__proto__;
|
Object.getPrototypeOf = function getPrototypeOf(obj) obj.__proto__;
|
||||||
if (!Object.keys)
|
if (!Object.keys)
|
||||||
Object.keys = function (obj)
|
Object.keys = function keys(obj)
|
||||||
Object.getOwnPropertyNames(obj).filter(function (k) objproto.propertyIsEnumerable.call(obj, k));
|
Object.getOwnPropertyNames(obj).filter(function (k) objproto.propertyIsEnumerable.call(obj, k));
|
||||||
|
|
||||||
let use = {};
|
let use = {};
|
||||||
|
|||||||
Reference in New Issue
Block a user