gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-22 03:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Use dash for sh where available.

Browse Source
This commit is contained in:
Kris Maglione
2014-03-29 10:04:43 -07:00
parent 3380ed7cb6
commit e7549b249b
4 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/Makefile
View File

@@ -1,11 +1,17 @@
#### configuration #### configuration
_SH := $(shell if which dash >/dev/null 2>&1; \
then echo dash; \
else echo sh; \
fi)
SH ?= $(_SH)
AWK ?= awk AWK ?= awk
B64ENCODE ?= base64 B64ENCODE ?= base64
CURL ?= curl CURL ?= curl
SED := $(shell if [ "xoo" = x$$(echo foo | sed -E 's/f(o)/\1/' 2>/dev/null) ]; \ SED := $(shell if [ "xoo" = x$$(echo foo | sed -E 's/f(o)/\1/' 2>/dev/null) ]; \
then echo sed -E; else echo sed -r; \ then echo sed -E; \
else echo sed -r; \
fi) fi)
TOP = $(shell pwd) TOP = $(shell pwd)
@@ -28,7 +34,7 @@ LOCALEDIR = locale
DOC_FILES = $(wildcard $(LOCALEDIR)/*/*.xml) DOC_FILES = $(wildcard $(LOCALEDIR)/*/*.xml)
export VERSION BUILD_DATE export VERSION BUILD_DATE
MAKE_JAR = sh $(BASE)/make_jar.sh MAKE_JAR = $(SH) $(BASE)/make_jar.sh
# TODO: specify source files manually? # TODO: specify source files manually?
JAR_BASES = $(TOP) $(BASE) JAR_BASES = $(TOP) $(BASE)

8
common/content/browser.js
View File

@@ -1,6 +1,6 @@
// Copyright (c) 2006-2008 by Martin Stubenschrott <stubenschrott@vimperator.org> // Copyright (c) 2006-2008 by Martin Stubenschrott <stubenschrott@vimperator.org>
// Copyright (c) 2007-2011 by Doug Kearns <dougkearns@gmail.com> // Copyright (c) 2007-2011 by Doug Kearns <dougkearns@gmail.com>
// Copyright (c) 2008-2013 Kris Maglione <maglione.k at Gmail> // Copyright (c) 2008-2014 Kris Maglione <maglione.k at Gmail>
// //
// This work is licensed for reuse under an MIT license. Details are // This work is licensed for reuse under an MIT license. Details are
// given in the LICENSE.txt file included with this file. // given in the LICENSE.txt file included with this file.
@@ -16,11 +16,17 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
this.cleanupProgressListener = overlay.overlayObject(window.XULBrowserWindow, this.cleanupProgressListener = overlay.overlayObject(window.XULBrowserWindow,
this.progressListener); this.progressListener);
util.addObserver(this); util.addObserver(this);
this._unoverlay = overlay.overlayObject(FullZoom, {
get siteSpecific() false,
set siteSpecific(val) {}
});
}, },
destroy: function () { destroy: function () {
this.cleanupProgressListener(); this.cleanupProgressListener();
this.observe.unregister(); this.observe.unregister();
this._unoverlay();
}, },
observers: { observers: {

15
common/modules/buffer.jsm
View File

@@ -86,11 +86,16 @@ var Buffer = Module("Buffer", {
* @returns {Promise<string>} * @returns {Promise<string>}
*/ */
get: promises.withCallbacks(function get([resolve, reject], pref) { get: promises.withCallbacks(function get([resolve, reject], pref) {
services.contentPrefs.getByDomainAndName( let pref = services.contentPrefs.getCachedByDomainAndName(
self.uri.spec, pref, self.loadContext, self.uri.spec, pref, self.loadContext);
{ handleCompletion: () => {}, if (pref)
handleResult: resolve, resolve(pref.value);
handleError: reject }); else
services.contentPrefs.getByDomainAndName(
self.uri.spec, pref, self.loadContext,
{ handleCompletion: () => {},
handleResult: resolve,
handleError: reject });
}), }),
/** /**

15
common/modules/overlay.jsm
View File

@@ -336,18 +336,23 @@ var Overlay = Module("Overlay", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReferen
overrides = update(Object.create(original), overrides); overrides = update(Object.create(original), overrides);
Object.getOwnPropertyNames(overrides).forEach(function (k) { Object.getOwnPropertyNames(overrides).forEach(function (k) {
let orig, desc = Object.getOwnPropertyDescriptor(overrides, k); let desc = Object.getOwnPropertyDescriptor(overrides, k);
if (desc.value instanceof Class.Property) if (desc.value instanceof Class.Property)
desc = desc.value.init(k) || desc.value; desc = desc.value.init(k) || desc.value;
if (k in object) { if (k in object) {
for (let obj = object; obj && !orig; obj = Object.getPrototypeOf(obj)) for (let obj = object; obj && !orig; obj = Object.getPrototypeOf(obj)) {
if (orig = Object.getOwnPropertyDescriptor(obj, k)) var orig = Object.getOwnPropertyDescriptor(obj, k);
if (orig)
Object.defineProperty(original, k, orig); Object.defineProperty(original, k, orig);
}
if (!orig) if (!orig) {
if (orig = Object.getPropertyDescriptor(object, k)) orig = Object.getPropertyDescriptor(object, k);
if (orig)
Object.defineProperty(original, k, orig); Object.defineProperty(original, k, orig);
}
} }
// Guard against horrible add-ons that use eval-based monkey // Guard against horrible add-ons that use eval-based monkey