Merge branch 'npm'

fent · fent · commit 2d2f7f33abb7 · 2018-10-29T23:55:55.000-04:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Option pages should be easy to make given a structure of your options, and look like Chrome's options.
+Option pages should be simple to create given a structure of your options, ~and look like Chrome's options~.
 
 ![example](images/example.png)
 
@@ -19,8 +19,8 @@ Recommended that you create an options folder in your extension, keep things org
 
 Download chrome-options
 
-    bower install chrome-options
-    ln bower_components/chrome-options/options.html .
+    npm install chrome-options
+    ln node_modules/chrome-options/options.html .
     touch custom.css
     touch options.js
 
@@ -40,10 +40,10 @@ Needs `storage` permission. Options are saved to [`chrome.storage.sync`](https:/
 If you'll be using the [predefined_sound](#predefined_sound) fields, and want to play sounds from a content script, also add
 
     "web_accessible_resources": [
-      "options/bower_components/chrome-options/sounds/*.wav"
+      "options/node_modules/chrome-options/sounds/*.wav"
     ]
 
-If you're using git, consider adding `options/bower_components` to your `.gitignore`.
+If you're using git, consider adding `options/node_modules` to your `.gitignore`.
 
 Afterwards, you can start setting up your options page by editing `options.js`, and additionally, `custom.css` if you need to set any styles.
 
diff --git a/options.html b/options.html
@@ -4,8 +4,8 @@
   <meta charset="utf-8" />
   <title>chrome options</title>
   <link rel="stylesheet" type="text/css" href="custom.css" />
-  <script src="bower_components/chrome-options/dist/styles.min.js"></script>
-  <script src="bower_components/chrome-options/dist/main.min.js" defer></script>
+  <script src="node_modules/chrome-options/dist/styles.min.js"></script>
+  <script src="node_modules/chrome-options/dist/main.min.js" defer></script>
   <script src="options.js" defer></script>
 </head>
 <body class="chrome-bootstrap">
diff --git a/src/js/predefined-sound.js b/src/js/predefined-sound.js
@@ -10,7 +10,7 @@ chrome.options.fields.predefined_sound = (value, save, option) => {
     }
     $play.classList.remove('disabled');
     const audio = new Audio();
-    audio.src = 'bower_components/chrome-options/sounds/' + value + '.wav';
+    audio.src = 'node_modules/chrome-options/sounds/' + value + '.wav';
     audio.onerror = console.error;
     audio.play();
   };

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ chrome.options.fields.predefined_sound = (value, save, option) => {`
`10`	`10`	`}`
`11`	`11`	`$play.classList.remove('disabled');`
`12`	`12`	`const audio = new Audio();`
`13`		`- audio.src = 'bower_components/chrome-options/sounds/' + value + '.wav';`
	`13`	`+ audio.src = 'node_modules/chrome-options/sounds/' + value + '.wav';`
`14`	`14`	`audio.onerror = console.error;`
`15`	`15`	`audio.play();`
`16`	`16`	`};`