#32 Post merge fixes and moved around some files :D

manifest.json

@@ -1,38 +0,0 @@
-  {
-      "name": "Enhanced Aniwatch",
-      "version": "0.1.0.0",
-      "description": "Contains several enhancments for https://aniwatch.me.",
-      "manifest_version": 2,
-      "author": "Serraniel",
-      "homepage_url": "https://github.com/Serraniel/EnhancedAniwatch",
-      "options_ui": {
-              "page": "settings/settings.html",
-              "open_in_tab": true
-      },
-      "permissions": [
-              "storage"
-      ],
-      "content_scripts": [{
-              "matches": [
-                  "*://aniwatch.me/*"
-              ],
-              "js": [
-                  "settings/SettingsProvider.js",
-                  "utils/colors.js",
-                  "utils/helpers.js",
-                  "utils/aniwatchCore.js"
-              ],
-              "run_at": "document_start"
-          },
-          {
-              "matches": [
-                  "*://aniwatch.me/*"
-              ],
-              "js": [
-                  "enhancements/quickSearch.js",
-                  "enhancements/animeRequests.js"
-              ],
-              "run_at": "document_end"
-          }
-      ]
-  }

src/html/settings.html

@@ -17,7 +17,5 @@
     <button id="save">Save</button>
 
 </form>
-<script src="settings.js"></script>
-<script src="SettingsProvider.js"></script>
 </body>
 </html>

src/manifests/chrome.manifest.json

@@ -14,7 +14,12 @@
         "48": "images/icon/icon_48.png",
         "96": "images/icon/icon_96.png"
     },
-    "content_scripts": [{
+    "options_ui": {
+        "page": "html/settings.html",
+        "open_in_tab": true
+    },
+    "content_scripts": [
+        {
             "matches": [
                 "*://aniwatch.me/*"
             ],
@@ -25,5 +30,6 @@
                 "stylesheets/aniwatchplus.min.css"
             ],
             "run_at": "document_end"
-    }]
+        }
+    ]
 }

src/manifests/firefox.manifest.json

@@ -14,7 +14,12 @@
         "48": "images/icon/icon_48.png",
         "96": "images/icon/icon_96.png"
     },
-    "content_scripts": [{
+    "options_ui": {
+        "page": "html/settings.html",
+        "open_in_tab": true
+    },
+    "content_scripts": [
+        {
             "matches": [
                 "*://aniwatch.me/*"
             ],
@@ -25,5 +30,6 @@
                 "stylesheets/aniwatchplus.min.css"
             ],
             "run_at": "document_end"
-    }]
+        }
+    ]
 }

src/manifests/manifest.template.json

@@ -18,7 +18,12 @@
         "48": "images/icon/icon_48.png",
         "96": "images/icon/icon_96.png"
     },
-    "content_scripts": [{
+    "options_ui": {
+        "page": "html/settings.html",
+        "open_in_tab": true
+    },
+    "content_scripts": [
+        {
             "matches": [
                 "*://aniwatch.me/*"
             ],
@@ -29,5 +34,6 @@
                 "stylesheets/aniwatchplus.min.css"
             ],
             "run_at": "document_end"
-    }]
+        }
+    ]
 }

src/manifests/opera.manifest.json

@@ -15,7 +15,12 @@
         "48": "images/icon/icon_48.png",
         "96": "images/icon/icon_96.png"
     },
-    "content_scripts": [{
+    "options_ui": {
+        "page": "html/settings.html",
+        "open_in_tab": true
+    },
+    "content_scripts": [
+        {
             "matches": [
                 "*://aniwatch.me/*"
             ],
@@ -26,5 +31,6 @@
                 "stylesheets/aniwatchplus.min.css"
             ],
             "run_at": "document_end"
-    }]
+        }
+    ]
 }