From 7228a1f02c983490fb0b5375eb6ebcb0938a63c3 Mon Sep 17 00:00:00 2001
From: Nik Nyby <nikolas@gnu.org>
Date: Fri, 19 Jun 2015 19:01:44 -0400
Subject: more jpm compatibility

---
 lib/ui.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'lib/ui.js')

diff --git a/lib/ui.js b/lib/ui.js
index e135f57..6e9058a 100644
--- a/lib/ui.js
+++ b/lib/ui.js
@@ -25,20 +25,22 @@ let tabs = require("sdk/tabs");
 let {getMostRecentBrowserWindow} = require('sdk/window/utils');
 let {ToggleButton} = require('sdk/ui/button/toggle');
 
-let settings_tab = require('settings/settings_tab');
-let allowedRef = require("http_observer/allowed_referrers").allowedReferrers;
-let urlHandler = require("url_handler/url_handler");
-let removedScripts = require("script_entries/removed_scripts").removedScripts;
-let acceptedScripts = require("script_entries/accepted_scripts")
+let settings_tab = require('./settings/settings_tab');
+let allowedRef = require("./http_observer/allowed_referrers")
+    .allowedReferrers;
+let urlHandler = require("./url_handler/url_handler");
+let removedScripts = require("./script_entries/removed_scripts")
+    .removedScripts;
+let acceptedScripts = require("./script_entries/accepted_scripts")
     .acceptedScripts;
-let jsLabelsPagesVisited = require('html_script_finder/web_labels/js_web_labels')
+let jsLabelsPagesVisited = require('./html_script_finder/web_labels/js_web_labels')
     .jsLabelsPagesVisited;
-let dryRunScripts = require("script_entries/dryrun_scripts").dryRunScripts;
-let types = require("js_checker/constant_types");
-const removeHashCallback = require("js_checker/js_checker").removeHashCallback;
+let dryRunScripts = require("./script_entries/dryrun_scripts").dryRunScripts;
+let types = require("./js_checker/constant_types");
+const removeHashCallback = require("./js_checker/js_checker").removeHashCallback;
 
 // move to sub-module later
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+const scriptsCached = require("./script_entries/scripts_cache").scriptsCached;
 
 function generateDataURI (encodedText) {
     return "data:text/html;charset=UTF-8;base64," + encodedText;
-- 
cgit v1.2.3


From 3349cb55c55cdbd21fe26bfeef39c2205b4e5532 Mon Sep 17 00:00:00 2001
From: Nik Nyby <nikolas@gnu.org>
Date: Fri, 19 Jun 2015 19:18:13 -0400
Subject: use menuitem from npm

---
 lib/ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/ui.js')

diff --git a/lib/ui.js b/lib/ui.js
index 6e9058a..9229c4c 100644
--- a/lib/ui.js
+++ b/lib/ui.js
@@ -137,7 +137,7 @@ let UI = exports.UI = {
             }
         });
 
-        var menuitem = require("menuitems").Menuitem({
+        var menuitem = require("menuitem").Menuitem({
             id: 'librejs_settings',
             menuid: 'menu_ToolsPopup',
             label: 'LibreJS Whitelist',
-- 
cgit v1.2.3