diff --git a/browserAction/browserAction.js b/browserAction/browserAction.js
index 4473e8d..06630e3 100644
--- a/browserAction/browserAction.js
+++ b/browserAction/browserAction.js
@@ -4,8 +4,8 @@
(function(){
"use strict";
- const logging = require("./logging");
- const settings = require("./settings");
+ const logging = require("../lib/logging");
+ const settings = require("../lib/settings");
logging.message("Opened browser action");
settings.onloaded(function(){
diff --git a/lib/require.js b/lib/require.js
index 816d46d..4f84b60 100644
--- a/lib/require.js
+++ b/lib/require.js
@@ -10,12 +10,13 @@ const require = function(){
const scope = window.scope;
function getScopeName(module){
- var scopeName = module.substr(2).replace(/\..+/, "");
+ var scopeName = module.replace(/^\..*\//, "").replace(/\..+/, "");
+ // console.log(scopeName);
return scopeName;
}
function require(module){
- if (module.startsWith("./")){
+ if (module.startsWith(".")){
var scopeName = getScopeName(module);
return scope[scopeName];
}
diff --git a/options/export.js b/options/export.js
index 886fdda..889df95 100644
--- a/options/export.js
+++ b/options/export.js
@@ -4,9 +4,9 @@
(function(){
"use strict";
- const settings = require("./settings");
- const logging = require("./logging");
- const settingsMigration = require("./settingsMigration");
+ const settings = require("../lib/settings");
+ const logging = require("../lib/logging");
+ const settingsMigration = require("../lib/settingsMigration");
const input = document.getElementById("settings");
settings.onloaded(function(){
var data = {};
diff --git a/options/navigator.js b/options/navigator.js
index 1e1f3da..b688595 100644
--- a/options/navigator.js
+++ b/options/navigator.js
@@ -4,8 +4,8 @@
(function(){
"use strict";
- const settings = require("./settings");
- const navigator = require("./navigator");
+ const settings = require("../lib/settings");
+ const navigator = require("../lib/navigator");
const title = document.createElement("h1");
title.className = "title";
diff --git a/options/options.js b/options/options.js
index c80f43b..f3403f0 100644
--- a/options/options.js
+++ b/options/options.js
@@ -4,16 +4,16 @@
(function(){
"use strict";
- const logging = require("./logging");
+ const logging = require("../lib/logging");
logging.setPrefix("options page");
const optionsGui = require("./optionsGui");
- const settings = require("./settings");
- const settingsDisplay = require("./settingsDisplay");
- const search = require("./search");
- const settingStrings = require("./settingStrings");
+ const settings = require("../lib/settings");
+ const settingsDisplay = require("../lib/settingsDisplay");
+ const search = require("../lib/search");
+ const settingStrings = require("../lib/settingStrings");
const searchParameters = new URLSearchParams(window.location.search);
- const settingsMigration = require("./settingsMigration");
+ const settingsMigration = require("../lib/settingsMigration");
var callbacks = {
openNavigatorSettings: function(){
diff --git a/options/optionsGui.js b/options/optionsGui.js
index 8657bd3..aa05a55 100644
--- a/options/optionsGui.js
+++ b/options/optionsGui.js
@@ -12,7 +12,7 @@
scope = require.register("./optionsGui", {});
}
- const logging = require("./logging");
+ const logging = require("../lib/logging");
function createDescription(setting){
var c = document.createElement("div");
diff --git a/options/sanitationRules.js b/options/sanitationRules.js
index 4f802d6..381198a 100644
--- a/options/sanitationRules.js
+++ b/options/sanitationRules.js
@@ -12,7 +12,7 @@
scope = require.register("./sanitationRules", {});
}
- const settings = require("./settings");
+ const settings = require("../lib/settings");
scope.ruleset = [
{
diff --git a/options/sanitize.js b/options/sanitize.js
index 3950a62..8cb58e4 100644
--- a/options/sanitize.js
+++ b/options/sanitize.js
@@ -4,7 +4,7 @@
(function(){
"use strict";
- const settings = require("./settings");
+ const settings = require("../lib/settings");
const sanitationRules = require("./sanitationRules");
var title = document.createElement("h1");
diff --git a/pageAction/domainNotification.js b/pageAction/domainNotification.js
index 5611449..198deae 100644
--- a/pageAction/domainNotification.js
+++ b/pageAction/domainNotification.js
@@ -5,6 +5,7 @@
"use strict";
const {createCollapser, createActionButtons} = require("./gui");
+ const extension = require("../lib/extension");
const actions = [];
const addAction = function addAction(action){
@@ -13,7 +14,7 @@
const addToContainer = function(){
const container = document.getElementById("prints");
- container.querySelector("li").textContent = browser.i18n.getMessage("pleaseWait");
+ container.querySelector("li").textContent = extension.getTranslation("pleaseWait");
var first = true;
return function addToContainer(domainNotification){
@@ -103,7 +104,7 @@
this.textNode = function(){
return node;
};
- var messageParts = browser.i18n.getMessage(this.messageId).split(/\{url\}/g);
+ var messageParts = extension.getTranslation(this.messageId).split(/\{url\}/g);
node.appendChild(document.createTextNode(messageParts.shift()));
while (messageParts.length){
var urlSpan = document.createElement("span");
@@ -179,5 +180,10 @@
return domainNotification;
};
domainNotification.addAction = addAction;
- require.register("./domainNotification", domainNotification);
+ if ((typeof module) !== "undefined"){
+ module.exports = domainNotification;
+ }
+ else {
+ require.register("./domainNotification", domainNotification);
+ }
}());
\ No newline at end of file
diff --git a/pageAction/gui.js b/pageAction/gui.js
index 4fdd382..a1efada 100644
--- a/pageAction/gui.js
+++ b/pageAction/gui.js
@@ -5,14 +5,21 @@
(function(){
"use strict";
- const scope = require.register("./gui", {});
+ let scope;
+ if ((typeof exports) !== "undefined"){
+ scope = exports;
+ }
+ else {
+ scope = require.register("./gui", {});
+ }
- const {error, warning, message, notice, verbose, setPrefix: setLogPrefix} = require("./logging");
+ const {error, warning, message, notice, verbose, setPrefix: setLogPrefix} = require("../lib/logging");
+ const extension = require("../lib/extension");
scope.createCollapser = function(){
const messages = {
- more: browser.i18n.getMessage("more"),
- less: browser.i18n.getMessage("less")
+ more: extension.getTranslation("more"),
+ less: extension.getTranslation("less")
};
return function createCollapser(container){
diff --git a/pageAction/notification.js b/pageAction/notification.js
index 409452b..c126bc5 100644
--- a/pageAction/notification.js
+++ b/pageAction/notification.js
@@ -72,5 +72,11 @@
update(){}
}
Notification.addAction = addAction;
- require.register("./Notification", Notification);
+
+ if ((typeof module) !== "undefined"){
+ module.exports = Notification;
+ }
+ else {
+ require.register("./Notification", Notification);
+ }
}());
\ No newline at end of file
diff --git a/pageAction/pageAction.html b/pageAction/pageAction.html
index cd62f63..178198a 100644
--- a/pageAction/pageAction.html
+++ b/pageAction/pageAction.html
@@ -11,6 +11,7 @@
...
+
diff --git a/pageAction/pageAction.js b/pageAction/pageAction.js
index 69831ea..b6ee033 100644
--- a/pageAction/pageAction.js
+++ b/pageAction/pageAction.js
@@ -4,15 +4,15 @@
(function(){
"use strict";
- const settings = require("./settings");
- const {parseErrorStack} = require("./callingStack");
- const {error, warning, message, notice, verbose, setPrefix: setLogPrefix} = require("./logging");
+ const settings = require("../lib/settings");
+ const {parseErrorStack} = require("../lib/callingStack");
+ const {error, warning, message, notice, verbose, setPrefix: setLogPrefix} = require("../lib/logging");
setLogPrefix("page action script");
const domainNotification = require("./domainNotification");
const Notification = require("./Notification");
const {createActionButtons, modalPrompt, modalChoice} = require("./gui");
- const lists = require("./lists");
+ const lists = require("../lib/lists");
Promise.all([
browser.tabs.query({active: true, currentWindow: true}),