Merge pull request #4 from ericwclymer/master

Add options page
CodyJung · Feb 17, 2015 · 3450511 · 3450511
2 parents 9330042 + acaad17
commit 3450511
Show file tree

Hide file tree

Showing 9 changed files with 309 additions and 90 deletions.
diff --git a/background.js b/background.js
@@ -8,10 +8,11 @@
 	});
 	chrome.runtime.onInstalled.addListener(function(details) {
 		chrome.alarms.create("updater", { "periodInMinutes": 1 });
+		chrome.tabs.create({url: "options.html"}, function (tab) {});
 	});
 
 	// Update number on navigate to a new thread
 	chrome.webNavigation.onCompleted.addListener(function (details) {
 		ITCheck.getUnreadThreadCount(null);
 	},{url: [{hostSuffix: 'ivorytower.com', pathPrefix: '/IvoryTower/ForumThread.aspx'}]});
-})(window);
+})(window);	
diff --git a/cohort-year-adder.js b/cohort-year-adder.js
@@ -6,16 +6,29 @@
 // @include http://ivorytower.dyndns.org/*
 // @include http://ivorytower.go.dyndns.org/*
 // ==/UserScript==
+(function(){	 
+	var years = {
+		// Sanitized for GitHub. Added back on building.
+	};
 
-var years = {
-	// Sanitized for GitHub. Added back on building.
-};
-
-var elements = document.evaluate("//a[starts-with(@href,'ProfileShow.aspx')]",
-		document, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null);
-for(var i = 0; i < elements.snapshotLength; i++) {
-	var cur = elements.snapshotItem(i);
-	var name = cur.getAttribute('href').split('=')[1];
-	var year = document.createTextNode(" (" + years[name] + ")");
-	cur.appendChild(year);
-}
+	function runadder(showCohorts){
+		if(showCohorts){
+			var elements = document.evaluate("//a[starts-with(@href,'ProfileShow.aspx')]",
+					document, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null);
+			for(var i = 0; i < elements.snapshotLength; i++) {
+				var cur = elements.snapshotItem(i);
+				var name = cur.getAttribute('href').split('=')[1];
+				var year = document.createTextNode(" (" + years[name] + ")");
+				cur.appendChild(year);
+			}
+		}
+	}
+
+	function storageGet(key, callback){
+		var k = key;
+		chrome.storage.sync.get(k, function(storageObj){
+			callback(storageObj[k]);
+		});
+	}
+	storageGet('ITCheck.showCohorts', runadder);
+})();
diff --git a/core.js b/core.js
@@ -57,9 +57,30 @@
 		chrome.browserAction.setTitle({ title: newTitle});
 	}
 
+	function storageGet(key, callback){
+		var k = key;
+		chrome.storage.sync.get(k, function(storageObj){
+			callback(storageObj[k]);
+		})
+	}
+
+	function storageSet(key, val){
+		var pair = {};
+		pair[key] = val;
+		chrome.storage.sync.set(pair);
+	}
+
+	var shortcutKeys = ["nextPost","previousPost","unreadThread","rateUp","rateDown","showHidden"];
+	storageSet("ITCheck.shortcutKeys", shortcutKeys);
+
+	// core exports
 	window.ITCheck.getUnreadThreadCount = getUnreadThreadCount;
 	window.ITCheck.shouldSkipRequest = shouldSkipRequest;
 	window.ITCheck.updateBadge = updateBadge;
 	window.ITCheck.setTitle = setTitle;
 	window.ITCheck.baseUrl = baseUrl;
+	window.ITCheck.storageGet = storageGet;
+	window.ITCheck.storageSet = storageSet;
+	//window.ITCheck.shortcutKeys = shortcutKeys;
+
 })(window);
diff --git a/manifest.json b/manifest.json
@@ -1,9 +1,9 @@
 {
 	"name": "IvoryTower Checker",
 	"short_name": "IT Check",
-	"author": "Cody Jung",
-	"version": "1.3.0",
-	"description": "Checks IvoryTower for unread threads",
+	"author": "Cody Jung, Eric Clymer",
+	"version": "1.4.0",
+	"description": "Checks IvoryTower for unread threads, adds misc other functionality.",
 	"icons": {
 		"48": "icon48.png",
 		"128": "icon128.png"
@@ -16,16 +16,18 @@
 	"permissions": [
 		"alarms",
 		"webNavigation",
-		"http://ivorytower.com/"
+		"http://ivorytower.com/",
+		"storage"
 	],
+	"options_page": "options.html",
 	"background": {
 		"scripts": ["jquery-2.1.3.min.js", "core.js", "background.js"],
 		"persistent": false
 	},
 	"content_scripts": [
 		{
 		  "matches": ["http://*.ivorytower.com/*"],
-		  "js": ["jquery-2.1.3.min.js", "core.js", "cohort-year-adder.js", "shortcuts.js"]
+		  "js": ["jquery-2.1.3.min.js", "cohort-year-adder.js", "shortcuts.js"]
 		}
 	],
 	"manifest_version": 2

diff --git a/options.html b/options.html
@@ -0,0 +1,53 @@
+<html>
+	<head>
+		<script src='jquery-2.1.3.min.js' type='text/javascript'></script>
+		<link href="style.css" rel="stylesheet" type="text/css" media="screen" /> 
+	</head>
+	<body>
+		<h1>IvoryTower Checker</h1>
+		<hr>
+		<h2>Options</h2>
+		<form id="options">
+			<div id="topLevelSettings">
+				<div class="topLevelSetting">
+					<label for="showCohorts">Show Cohort By Users</label>
+					<input type="checkbox" name="showCohorts" />
+				</div>
+				<div class="topLevelSetting">
+					<label for="shortcuts">Enable Shortcuts</label>
+					<input type="checkbox" name="shortcuts" />
+				</div>
+			</div>
+			<div id="shortcutSection">
+				<h3>Customize Shortcut Keys</h3>
+				<div class="shortcutKey">
+					<label for="nextPost">Next Post</label>
+					<input type="text" size="1" name="nextPost" placeholder="j" />
+				</div>
+				<div class="shortcutKey">
+					<label for="previousPost">Previous Post</label>
+					<input type="text" size="1" name="previousPost" placeholder="k" />
+				</div>
+				<div class="shortcutKey">
+					<label for="unreadThread">Next Unread Thread</label>
+					<input type="text" size="1" name="unreadThread" placeholder="n" />
+				</div>
+				<div class="shortcutKey">
+					<label for="rateUp">Rate Up</label>
+					<input type="text" size="1" name="rateUp" placeholder="u" />
+				</div>
+				<div class="shortcutKey">
+					<label for="rateDown">Rate Down</label>
+					<input type="text" size="1" name="rateDown" placeholder="d" />
+				</div>
+				<div class="shortcutKey">
+					<label for="showHidden">Show Hidden</label>
+					<input type="text" size="1" name="showHidden" placeholder="h" />
+				</div>
+			</div>
+		</form>
+
+		<script src='core.js' type='text/javascript'></script>
+		<script src='options.js' type='text/javascript'></script> 
+	</body>
+</html>
diff --git a/options.js b/options.js
@@ -0,0 +1,53 @@
+(function(window, $){
+	window.ITCheck = window.ITCheck || {};
+
+	ITCheck.storageGet("ITCheck.shortcutKeys", function(shortcutKeys){
+		ITCheck.storageGet('ITCheck.showCohorts', function(val){
+			if(val){
+				options.showCohorts.checked = val;
+			}else{
+				ITCheck.storageSet('ITCheck.showCohorts', true);
+				val = true;
+			}
+			options.showCohorts.checked = val;
+		});
+		ITCheck.storageGet('ITCheck.shortcuts', function(val){
+			if(val){
+				options.shortcuts.checked = val;
+			}else{
+				ITCheck.storageSet('ITCheck.shortcuts', true);
+				val = true;
+			}
+			options.shortcuts.checked = val;
+		});
+		for(var i = 0; i < shortcutKeys.length; i++){
+			var shortcutKey = shortcutKeys[i];
+			populateShortcutKey(shortcutKey);
+		}
+		for(var i = 0; i < shortcutKeys.length; i++){
+			var shortcutKey = shortcutKeys[i];
+			options[shortcutKey].onchange = function(e, shortcutKey){
+				var target = e.target;
+				ITCheck.storageSet('ITCheck.shortcutKey.'+target.name, target.value);
+			}
+		}
+	});
+
+	function populateShortcutKey(shortcutKey){
+		ITCheck.storageGet('ITCheck.shortcutKey.'+shortcutKey, function(val){
+			if(val){
+				options[shortcutKey].value = val;
+			}
+		});
+	}
+
+	var options = $('#options')[0];
+	options.showCohorts.onchange = function() {
+		ITCheck.storageSet('ITCheck.showCohorts', options.showCohorts.checked);
+	};
+
+	options.shortcuts.onchange = function() {
+		ITCheck.storageSet('ITCheck.shortcuts', options.shortcuts.checked);
+		$('#shortcutSection').toggle(options.shortcuts.checked);
+	};
+})(window, jQuery);
diff --git a/popup.js b/popup.js
@@ -43,7 +43,7 @@
 			} else {
 				// Or set it to blank
 				ITCheck.updateBadge("");
-				updatePopup("No unread threads.<br /><a href='#' id='ITToday'>Go to IvoryTower Today</a>");
+				updatePopup("No unread threads.<div><a href='#' id='ITToday'>Go to IvoryTower Today</a></div>");
 
 				$("#ITToday").click(function() {
 					openIvoryTowerToday();