use menuitem from npm

2 files changed, 62 insertions, 63 deletions

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',
diff --git a/package.json b/package.json
index 73d01cd..97ac132 100644
--- a/package.json
+++ b/package.json
@@ -1,68 +1,67 @@
 {
-    "name": "librejs",
-    "license": "GPL-3.0+",
-    "author": "Loic J. Duros",
-    "homepage": "gnu.org/software/librejs/",
-    "version": "6.0.10.20151023",
-    "title": "GNU LibreJS",
-    "id": "jid1-KtlZuoiikVfFew@jetpack",
-    "description": "GNU LibreJS is an add-on for Mozilla-based browsers (IceCat, Firefox, Abrowser, Iceweasel)\n that prevents the execution of nonfree nontrivial JavaScript as described in \"The Javascript Trap\": http://www.gnu.org/philosophy/javascript-trap.html",
-    "main": "lib/main.js",
-    "icon": "data/widget/images/librejs-32.png",
-    "icon64": "data/widget/images/librejs-64.png",
-    "dependencies": [
-        "notification-box",
-        "addon-sdk",
-        "menuitems",
-        "vold-utils"
-    ],
-    "permissions": {
-        "private-browsing": true,
-        "unsafe-content-script": true
+  "name": "librejs",
+  "license": "GPL-3.0+",
+  "author": "Loic J. Duros",
+  "homepage": "gnu.org/software/librejs/",
+  "version": "6.0.10.20151023",
+  "title": "GNU LibreJS",
+  "id": "jid1-KtlZuoiikVfFew@jetpack",
+  "description": "GNU LibreJS is an add-on for Mozilla-based browsers (IceCat, Firefox, Abrowser, Iceweasel)\n that prevents the execution of nonfree nontrivial JavaScript as described in \"The Javascript Trap\": http://www.gnu.org/philosophy/javascript-trap.html",
+  "main": "lib/main.js",
+  "icon": "data/widget/images/librejs-32.png",
+  "icon64": "data/widget/images/librejs-64.png",
+  "dependencies": {
+    "0": "notification-box",
+    "3": "vold-utils",
+    "menuitem": "0.0.4"
+  },
+  "permissions": {
+    "private-browsing": true,
+    "unsafe-content-script": true
+  },
+  "preferences": [
+    {
+      "name": "whitelist",
+      "title": "Whitelist domain, separated by comma, omit protocol, e.g.: gnu.org, wildcard is *",
+      "type": "string",
+      "value": ""
     },
-    "preferences": [
-        {
-            "name": "whitelist",
-            "title": "Whitelist domain, separated by comma, omit protocol, e.g.: gnu.org, wildcard is *",
-            "type": "string",
-            "value": ""
-        },
-        {
-            "name": "complaint_tab",
-            "title": "Display complaint tab on sites where nonfree nontrivial JavaScript is detected",
-            "type": "bool",
-            "value": true
-        },
-        {
-            "name": "display_notifications",
-            "title": "Display notifications of the JavaScript code being analyzed by LibreJS.",
-            "type": "bool",
-            "value": false
-        },
-        {
-            "name": "complaint_email_subject",
-            "title": "Complaint email subject",
-            "description": "Initial subject line used in complaint emails",
-            "type": "string",
-            "value": "Please make your JavaScript free"
-        },
-        {
-            "name": "complaint_email_body",
-            "title": "Complaint email body",
-            "description": "Initial body text used in complaint emails",
-            "type": "string",
-            "value": "I could not use your site because it requires running JavaScript code which is not free software.  Since a nonfree program disrespects the user's freedom, I decided not to run it. \\n\\nSee http://gnu.org/philosophy/javascript-trap.html for more information, and please make your JavaScript code free."
-        }
-    ],
-    "scripts": {
-        "pretest": "jshint ./lib/ ./data/ --exclude ./data/settings/third-party/",
-        "test": "cfx test -v"
+    {
+      "name": "complaint_tab",
+      "title": "Display complaint tab on sites where nonfree nontrivial JavaScript is detected",
+      "type": "bool",
+      "value": true
     },
-    "jscsConfig": {
-        "preset": "google",
-        "validateIndentation": 4
+    {
+      "name": "display_notifications",
+      "title": "Display notifications of the JavaScript code being analyzed by LibreJS.",
+      "type": "bool",
+      "value": false
     },
-    "jshintConfig": {
-        "moz": true
+    {
+      "name": "complaint_email_subject",
+      "title": "Complaint email subject",
+      "description": "Initial subject line used in complaint emails",
+      "type": "string",
+      "value": "Please make your JavaScript free"
+    },
+    {
+      "name": "complaint_email_body",
+      "title": "Complaint email body",
+      "description": "Initial body text used in complaint emails",
+      "type": "string",
+      "value": "I could not use your site because it requires running JavaScript code which is not free software.  Since a nonfree program disrespects the user's freedom, I decided not to run it. \\n\\nSee http://gnu.org/philosophy/javascript-trap.html for more information, and please make your JavaScript code free."
     }
+  ],
+  "scripts": {
+    "pretest": "jshint ./lib/ ./data/ --exclude ./data/settings/third-party/",
+    "test": "cfx test -v"
+  },
+  "jscsConfig": {
+    "preset": "google",
+    "validateIndentation": 4
+  },
+  "jshintConfig": {
+    "moz": true
+  }
 }