Cleaned up popup

Author: MidasLamb

manifest.json

@@ -8,7 +8,7 @@
 
 
     "browser_action": {
-        "default_popup": "src/options/options.html"
+        "default_popup": "src/popup/popup.html"
     },
     "permissions": [
       "activeTab",

src/main.js

@@ -1,6 +1,10 @@
 var skills = ["Attack","Defence","Strength","Constitution","Ranged","Prayer","Magic","Cooking","Woodcutting","Fletching","Fishing","Firemaking","Crafting","Smithing","Mining","Herblore","Agility","Thieving","Slayer","Farming","Runecrafting","Hunter","Construction","Summoning","Dungeoneering","Divination","Invention"
-];
+]; //Used to turn skill ID's into usable names.
 
+/**
+ * Adds the checks to the quest requirements.
+ * @param {[quests]} userQuests 
+ */
 function addQuestCompletedChecks(userQuests){
     $(".questreq a").each(function(index){
         if ($(this).html().toLowerCase() != "expand" || $(this).html().toLowerCase() != "collapse"){
@@ -15,6 +19,10 @@ function addQuestCompletedChecks(userQuests){
     });
 }
 
+/**
+ * Adds the checks to the skill requirements.
+ * @param {[skillName: level]} userLevels 
+ */
 function addLevelDetailChecks(userLevels){
     $(".questdetails-info > ul > li").each(function(index){
         var textArr = $(this).text().split(" ");
@@ -41,19 +49,23 @@ function addLevelDetailChecks(userLevels){
 
 function loadUserData(username, tries){
     loadUserQuests(username, tries);
-    loadUserStats(username, tries);
+    loadUserSkills(username, tries);
 }
 
+/**
+ * Get the user's quest data and pass it along to function addQuestCompleteChecks()
+ * @param {string} username - The in-game username of the user.
+ * @param {int} tries - The amount of tries to get userdata before giving up.
+ */
 function loadUserQuests(username, tries){
     $.ajax({ // Get the quest data
         type:"GET",
         url:"https://apps.runescape.com/runemetrics/quests?user=" + username,
         success: function(msg){
             if (msg["quests"].length == 0){
                 if (tries <= 0){
-                    console.log("Could not fetch quest data!");
+                    console.error("Could not fetch quest data!");
                 } else {
-                    console.log("Trying quests again!");
                     loadUserData(username, tries-1);
                 }
             } else {
@@ -68,40 +80,49 @@ function loadUserQuests(username, tries){
     });
 }
 
-function loadUserStats(username, tries){
+/**
+ * Loads the users skills and passes it along to the function addLevelDetailChecks().
+ * @param {string} username - The in-game username of the user.
+ * @param {int} tries - The amount of tries to get userdata before giving up.
+ */
+function loadUserSkills(username, tries){
     $.ajax({ // Get the skill data.
         type:"GET",
         url:"https://apps.runescape.com/runemetrics/profile/profile?user=" + username + "&activities=0",
         success: function(msg){
             if ("error" in msg){
                 if (tries <= 0){
-                    console.log("Could not fetch skills data!");
+                    console.error("Could not fetch skills data!");
                 } else {
-                    Console.log("Trying stats again!");
-                    loadUserStats(username, tries-1);
+                    loadUserSkills(username, tries-1);
                 }
             } else {
                 var userLevels = [];
                 msg["skillvalues"].forEach(function(item, index){
-                // console.log(skills[item["id"]] + ": " +item["level"]);
-                    userLevels[skills[item["id"]]] = item["level"];
-                    
+                    userLevels[skills[item["id"]]] = item["level"]; 
                 });
                 addLevelDetailChecks(userLevels);
             }
         }
     });
 }
 
+/**
+ * Get the configuration with standard values in case something is missing.
+ * @param {requestCallback} func - the function which does something with the configuration.
+ */
 function getConfig(func){
     chrome.storage.sync.get({
         username: ""
     }, func);
 }
 
+/**
+ * Load the config and start everything.
+ */
 function init(){
     getConfig(function(config){
-        loadUserData(config.username, 1);
+        loadUserData(config.username, 5);
     });
 }
 

src/options/options.html

@@ -0,0 +1,20 @@
+<html style="height:180px">
+<head>
+    <script src="/assets/js/jquery-3.2.1.min.js"></script>
+    <script src="/src/popup/popup.js"></script>
+</head>
+<body style="height:180px">
+    <div>
+    <h3> Options: </h3> 
+    <h4 style="margin-bottom:5px"> Username: </h4>
+    <input type=text id="options_username">
+    <button id="options_save_button" style="margin-top:10px">Save options</button>
+    <span id=status style="text-align:center"></span>
+    </div>
+    <div style="text-align:center;margin-top:20px">
+        Want to help? Found a bug?  <br>
+        <i>Or want an extra feature?</i> <br>
+        Create an issue on <strong><a href="https://github.com/MidasLamb/RS-Wiki-Quest-Checker/issues" target=>GitHub</a></strong>
+    </div>
+</body>
+</html>

src/options/options.js

@@ -0,0 +1,26 @@
+function saveOptions(){
+    var userName = $("#options_username").val();
+    chrome.storage.sync.set({
+        username: userName
+    }, function(){
+        $('#status').html("Options Set!");
+        setTimeout(function() {
+            $('#status').html("");
+        }, 1000);
+    });
+}
+
+$(document).ready(function(){
+    $('body').on('click', 'a', function(){
+      chrome.tabs.create({url: $(this).attr('href')});
+      return false;
+    });
+
+    chrome.storage.sync.get({
+        username: ""
+    }, function(items){
+        $("#options_username").val(items.username);
+    });
+
+    $("#options_save_button").click(saveOptions);
+ });