aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/uglifyjs2
-rw-r--r--tools/node.js8
2 files changed, 8 insertions, 2 deletions
diff --git a/bin/uglifyjs b/bin/uglifyjs
index 2980a67e..63756665 100755
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -159,7 +159,7 @@ if (ARGS.reserved_file) ARGS.reserved_file.forEach(function(filename){
});
if (ARGS.reserve_domprops) {
- RESERVED = UglifyJS.readReservedFile(path.join(__dirname, "..", "tools", "domprops.json"), RESERVED);
+ RESERVED = UglifyJS.readDefaultReservedFile(RESERVED);
}
if (ARGS.d) {
diff --git a/tools/node.js b/tools/node.js
index 048630de..054a05c0 100644
--- a/tools/node.js
+++ b/tools/node.js
@@ -194,7 +194,7 @@ exports.describe_ast = function() {
return out + "";
};
-exports.readReservedFile = function(filename, reserved) {
+function readReservedFile(filename, reserved) {
if (!reserved) {
reserved = { vars: [], props: [] };
}
@@ -211,6 +211,12 @@ exports.readReservedFile = function(filename, reserved) {
});
}
return reserved;
+}
+
+exports.readReservedFile = readReservedFile;
+
+exports.readDefaultReservedFile = function(reserved) {
+ return readReservedFile(path.join(__dirname, "domprops.json"), reserved);
};
exports.readNameCache = function(filename, key) {