Add button to discard remaining time (proginosko#279)

background.js

@@ -1254,7 +1254,7 @@ function applyOverride(endTime) {
 	updateIcon();
 }
 
-// Reset rollover time for all sets applicable to active tab
+// Reset rollover time for set applicable to active tab
 //
 function resetRolloverTime() {
 	//log("resetRolloverTime");
@@ -1266,11 +1266,33 @@ function resetRolloverTime() {
 	// Get block set for currently active time limit
 	let set = gTabs[gActiveTabId].secsLeftSet;
 	if (set) {
-		// Reset rollover time
+		// Reset rollover time for current period
 		gOptions[`timedata${set}`][5] = 0;
 	}
 }
 
+// Discard remaining time for set applicable to active tab
+//
+function discardRemainingTime() {
+	//log("discardRemainingTime");
+
+	if (!gGotOptions || !gActiveTabId) {
+		return;
+	}
+
+	// Get block set for currently active time limit
+	let set = gTabs[gActiveTabId].secsLeftSet;
+	if (set) {
+		// Set used time to time limit
+		let limitMins = gOptions[`limitMins${set}`];
+		gOptions[`timedata${set}`][3] = (limitMins * 60);
+		// Reset rollover time for current period
+		gOptions[`timedata${set}`][5] = 0;
+		// Reset rollover time for next period
+		gOptions[`timedata${set}`][6] = 0;
+	}
+}
+
 // Open extension page (either create new tab or activate existing tab)
 //
 function openExtensionPage(url) {
@@ -1413,6 +1435,11 @@ function handleMessage(message, sender, sendResponse) {
 			openDelayedPage(sender.tab.id, url, set, autoLoad);
 			break;
 
+		case "discard-time":
+			// Discard remaining time
+			discardRemainingTime();
+			break;
+
 		case "loaded":
 			// Register that content script has been loaded
 			gTabs[sender.tab.id].loaded = true;

popup.css

@@ -9,7 +9,7 @@ body {
 
 #button-container {
 	display: inline-block;
-	width: 150px;
+	width: 180px;
 }
 
 button {

popup.html

@@ -24,6 +24,7 @@
 			<br><br>
 			<button id="cancelOverride" type="button">Cancel Override</button>
 			<button id="resetRollover" type="button">Reset Rollover Time</button>
+			<button id="discardTime" type="button">Discard Remaining Time</button>
 		</div>
 		<script src="/popup.js"></script>
 	</body>

popup.js

@@ -83,7 +83,7 @@ function cancelOverride() {
 	window.close();
 }
 
-// Reset rollover
+// Reset rollover time
 //
 function resetRollover() {
 	let message = {
@@ -94,11 +94,23 @@ function resetRollover() {
 	window.close();
 }
 
+// Discard remaining time
+//
+function discardTime() {
+	let message = {
+		type: "discard-time",
+	};
+	browser.runtime.sendMessage(message);
+
+	window.close();
+}
+
 document.querySelector("#options").addEventListener("click", openOptions);
 document.querySelector("#lockdown").addEventListener("click", openLockdown);
 document.querySelector("#override").addEventListener("click", openOverride);
 document.querySelector("#stats").addEventListener("click", openStats);
 document.querySelector("#cancelOverride").addEventListener("click", cancelOverride);
 document.querySelector("#resetRollover").addEventListener("click", resetRollover);
+document.querySelector("#discardTime").addEventListener("click", discardTime);
 
 document.addEventListener("DOMContentLoaded", initializePage);