Merge pull request mac-cain13#57 from thornview/master

trigger value support

Author: mac-cain13

source/background.js

@@ -11,6 +11,8 @@ chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
 	var sites = [],
 		ideKey = "XDEBUG_ECLIPSE",
 		match = true,
+		tt = ideKey,
+		pt = ideKey,
 		domain;
 
 	// Check if localStorage is available and get the settings out of it
@@ -25,6 +27,16 @@ chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
 		{
 			ideKey = localStorage["xdebugIdeKey"];
 		}
+
+		if (localStorage["xdebugTraceTrigger"])
+		{
+			tt = localStorage["xdebugTraceTrigger"];
+		}
+
+		if (localStorage["xdebugProfileTrigger"])
+		{
+			pt = localStorage["xdebugProfileTrigger"];
+		}
 	}
 
 	// Get the current domain out of the tab URL and check if it matches anything in the sites array
@@ -42,11 +54,17 @@ chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
 			tabId,
 			{
 				cmd: "getStatus",
-				idekey: ideKey
+				idekey: ideKey,
+				tt: tt,
+				pt: pt
 			},
 			function(response)
 			{
-				updateIcon(response.status, tabId);
+				if (chrome.runtime.lastError) {
+					console.log("Error: ", chrome.runtime.lastError);
+				} else {
+					updateIcon(response.status, tabId);
+				}
 			}
 		);
 	}
@@ -57,13 +75,25 @@ chrome.commands.onCommand.addListener(function(command)
 	if ('toggle_debug_action' == command)
 	{
 		var ideKey = "XDEBUG_ECLIPSE";
+		var tt = ideKey;
+		var pt = ideKey;
 
 		// Check if localStorage is available and get the settings out of it
 		if (localStorage && localStorage["xdebugIdeKey"])
 		{
 			ideKey = localStorage["xdebugIdeKey"];
 		}
 
+		if (localStorage && localStorage["xdebugTraceTrigger"])
+		{
+			tt = localStorage["xdebugTraceTrigger"];
+		}
+
+		if (localStorage && localStorage["xdebugProfileTrigger"])
+		{
+			pt = localStorage["xdebugProfileTrigger"];
+		}
+
 		// Fetch the active tab
 		chrome.tabs.query({ active: true, windowId: chrome.windows.WINDOW_ID_CURRENT }, function(tabs)
 		{
@@ -72,7 +102,9 @@ chrome.commands.onCommand.addListener(function(command)
 				tabs[0].id,
 				{
 					cmd: "getStatus",
-					idekey: ideKey
+					idekey: ideKey,
+					tt: tt,
+					pt: pt
 				},
 				function(response)
 				{
@@ -84,7 +116,9 @@ chrome.commands.onCommand.addListener(function(command)
 						{
 							cmd: "setStatus",
 							status: newState,
-							idekey: ideKey
+							idekey: ideKey,
+							tt: tt,
+							pt: pt
 						},
 						function(response)
 						{

source/content.js

@@ -44,46 +44,56 @@ var xdebug = (function() {
 		messageListener : function(request, sender, sendResponse)
 		{
 			var newStatus,
-				idekey = "XDEBUG_ECLIPSE";
+				idekey = "XDEBUG_ECLIPSE",
+				tt = null,
+				pt = null;
 
 			// Use the IDE key from the request, if any is given
 			if (request.idekey)
 			{
 				idekey = request.idekey;
 			}
+			if (request.tt)
+			{
+				tt = request.tt;
+			}
+			if (request.pt)
+			{
+				pt = request.pt;
+			}
 
 			// Execute the requested command
 			if (request.cmd == "getStatus")
 			{
-				newStatus = exposed.getStatus(idekey);
+				newStatus = exposed.getStatus(idekey, tt, pt);
 			}
 			else if (request.cmd == "toggleStatus")
 			{
-				newStatus = exposed.toggleStatus(idekey);
+				newStatus = exposed.toggleStatus(idekey, tt, pt);
 			}
 			else if (request.cmd == "setStatus")
 			{
-				newStatus = exposed.setStatus(request.status, idekey);
+				newStatus = exposed.setStatus(request.status, idekey, tt, pt);
 			}
 
 			// Respond with the current status
 			sendResponse({ status: newStatus });
 		},
 
 		// Get current state
-		getStatus : function(idekey)
+		getStatus : function(idekey, tt, pt)
 		{
 			var status = 0;
 
 			if (getCookie("XDEBUG_SESSION") == idekey)
 			{
 				status = 1;
 			}
-			else if (getCookie("XDEBUG_PROFILE") == idekey)
+			else if (getCookie("XDEBUG_PROFILE") == pt)
 			{
 				status = 2;
 			}
-			else if (getCookie("XDEBUG_TRACE") == idekey)
+			else if (getCookie("XDEBUG_TRACE") == tt)
 			{
 				status = 3;
 			}
@@ -92,14 +102,14 @@ var xdebug = (function() {
 		},
 
 		// Toggle to the next state
-		toggleStatus : function(idekey)
+		toggleStatus : function(idekey, tt, pt)
 		{
-			var nextStatus = (exposed.getStatus(idekey) + 1) % 4;
-			return exposed.setStatus(nextStatus, idekey);
+			var nextStatus = (exposed.getStatus(idekey, tt, pt) + 1) % 4;
+			return exposed.setStatus(nextStatus, idekey, tt, pt);
 		},
 
 		// Set the state
-		setStatus : function(status, idekey)
+		setStatus : function(status, idekey, tt, pt)
 		{
 			if (status == 1)
 			{
@@ -112,15 +122,16 @@ var xdebug = (function() {
 			{
 				// Set profiling on
 				deleteCookie("XDEBUG_SESSION");
-				setCookie("XDEBUG_PROFILE", idekey, 24);
+				setCookie("XDEBUG_PROFILE", pt, 24);
 				deleteCookie("XDEBUG_TRACE");
+
 			}
 			else if (status == 3)
 			{
 				// Set tracing on
 				deleteCookie("XDEBUG_SESSION");
 				deleteCookie("XDEBUG_PROFILE");
-				setCookie("XDEBUG_TRACE", idekey, 24);
+				setCookie("XDEBUG_TRACE", tt, 24);
 			}
 			else
 			{
@@ -131,7 +142,7 @@ var xdebug = (function() {
 			}
 
 			// Return the new status
-			return exposed.getStatus(idekey);
+			return exposed.getStatus(idekey, tt, pt);
 		}
 	};
 

source/manifest.json

@@ -1,7 +1,7 @@
 {
-	"name": "Xdebug helper",
+	"name": "Xdebug helper - DEV",
 	"description": "Easy debugging, profiling and tracing extension for Xdebug",
-	"version": "1.4.3",
+	"version": "1.5",
 	"author": "Mathijs Kadijk",
 
 	"manifest_version": 2,

source/options.css

@@ -13,6 +13,12 @@ h1, h2, h3 {
 	margin-bottom: -5px;
 }
 
+h3 {
+	background-color: rgba(61, 167, 41, 0.48);
+	color: rgba(27, 54, 23, 0.99);
+	padding: 5px;
+}
+
 h1 {
 	margin: 0 0 -15px 0;
 }
@@ -37,6 +43,13 @@ body {
 	font-size: 0.95em;
 }
 
+button {
+	float: right;
+	margin: 5px;
+	font-size: 1.25em;
+	color: rgba(27, 54, 23, 0.99);
+}
+
 .contentTxt {
 	margin-bottom: 5px;
 }
@@ -84,16 +97,16 @@ body {
 	margin-right: -7px;
 }
 
-#hint {
+.hint {
 	font-size: 0.8em;
 	padding: 7px;
 	width: 190px;
 	text-align: center;
-	background-color: #c8e8c3;
+	background-color: rgb(251, 242, 185);
 	border-radius: 5px;
 }
 
-#hint img {
+.hint img {
 	vertical-align: bottom;
 }
 

source/options.html

@@ -27,7 +27,7 @@ <h3>Introduction</h3>
 				<img class="inlineicon" alt="" src="images/clock.png" /> Profiling enabled<br />
 				<img class="inlineicon" alt="" src="images/script.png" /> Tracing enabled
 			</p>
-			<p id="hint"><img src="images/lightbulb.png" alt="Tip!" title="Tip!" /> Love hotkeys? Try Ctrl+Shift+X</p>
+			<p class="hint"><img src="images/lightbulb.png" alt="Tip!" title="Tip!" /> Love hotkeys? Try Ctrl+Shift+X</p>
 
 			<h3>IDE key</h3>
 			<p class="note">Select your IDE to use the default sessionkey or choose other to use a custom key.</p>
@@ -39,7 +39,21 @@ <h3>IDE key</h3>
 					<option value="PHPSTORM">PhpStorm</option>
 					<option value="null">Other</option>
 				</select>
-				<span id="customkey"><input type="text" id="idekey" /> <a href="#" id="save-options"><img id="saveButton" src="images/disk.png" alt="Save" title="Save" /></a></span>
+				<span id="customkey"><input type="text" id="idekey" /> </span>
+			</p>
+
+			<h3>Trace Trigger Value</h3>
+			<p class="note">If your xdebug is configured with a unique trace trigger key,
+			set that value here.  This value is blank by default.</p>
+			<p>
+				<input type="text" id="tracetrigger" value="">
+			</p>
+
+			<h3>Profile Trigger Value</h3>
+			<p class="note">If your xdebug is configured with a unique profile trigger key,
+				set that value here.  This value is blank by default.</p>
+			<p>
+				<input type="text" id="profiletrigger" value="">
 			</p>
 
 			<h3>Domain filter</h3>
@@ -51,7 +65,10 @@ <h3>Domain filter</h3>
 				<a id='remove-site'><img id="removeButton" src="images/delete.png" alt="Remove selected" title="Remove selected" /></a>
 			</p>
 
-			<p id="hint"><img class="inlineicon" src="images/lightbulb.png" alt="Tip!" title="Tip!" /> <a href="http://wrepblog.tumblr.com/post/31720573340/xdebug-helper-for-chrome-how-to-use-the-domain-filter" target="_blank">Need help? Read our <span>blogpost</span>!</a></p>
+			<p>
+				<button class="button" id="save-options">Save Changes</button>
+			</p>
+			<p class="hint"><img class="inlineicon" src="images/lightbulb.png" alt="Tip!" title="Tip!" /> <a href="http://wrepblog.tumblr.com/post/31720573340/xdebug-helper-for-chrome-how-to-use-the-domain-filter" target="_blank">Need help? Read our <span>blogpost</span>!</a></p>
 		</div>
 
 		<div id="footer">

source/options.js

@@ -1,8 +1,8 @@
 function save_options()
 {
-	input = document.getElementById("idekey");
-	idekey = input.value;
-	localStorage["xdebugIdeKey"] = idekey;
+	localStorage["xdebugIdeKey"] = document.getElementById("idekey").value;
+	localStorage["xdebugTraceTrigger"] = document.getElementById("tracetrigger").value;
+	localStorage["xdebugProfileTrigger"] = document.getElementById("profiletrigger").value;
 
 	siteBox = document.getElementById("siteBox");
 	sites = [];
@@ -15,6 +15,7 @@ function save_options()
 
 function restore_options()
 {
+	// Restore IDE Key
 	idekey = localStorage["xdebugIdeKey"];
 
 	if (!idekey)
@@ -33,6 +34,23 @@ function restore_options()
 	}
 	$('#idekey').val(idekey);
 
+	// Restore Trace Triggers
+	var tt = localStorage["xdebugTraceTrigger"];
+	if (tt !== null)	{
+		$("#tracetrigger").val(tt);
+	} else {
+		$("#tracetrigger").val(null);
+	}
+
+	// Restore Profile Triggers
+	var pt = localStorage["xdebugProfileTrigger"];
+	if (pt !== null)	{
+		$("#profiletrigger").val(pt);
+	} else {
+		$("#profiletrigger").val(null);
+	}
+
+	// Restore Sites
 	sites = localStorage["sites"];
 	if (sites)
 	{

source/popup.js

@@ -1,20 +1,34 @@
 $(function() {
 	var ideKey = "XDEBUG_ECLIPSE";
+	var tt = ideKey;
+	var pt = ideKey;
 
 	// Check if localStorage is available and get the ideKey out of it if any
 	if (localStorage && localStorage["xdebugIdeKey"])
 	{
 		ideKey = localStorage["xdebugIdeKey"];
 	}
 
+	if (localStorage && localStorage["xdebugTraceTrigger"])
+	{
+		tt = localStorage["xdebugTraceTrigger"];
+	}
+
+	if (localStorage && localStorage["xdebugProfileTrigger"])
+	{
+		pt = localStorage["xdebugProfileTrigger"];
+	}
+
 	// Request the current state from the active tab
 	chrome.tabs.query({ active: true, windowId: chrome.windows.WINDOW_ID_CURRENT }, function(tabs)
 	{
 		chrome.tabs.sendMessage(
 				tabs[0].id,
 				{
 					cmd: "getStatus",
-					idekey: ideKey
+					idekey: ideKey,
+					tt: tt,
+					pt: pt
 				},
 				function(response)
 				{
@@ -36,7 +50,9 @@ $(function() {
 				{
 					cmd: "setStatus",
 					status: newStatus,
-					idekey: ideKey
+					idekey: ideKey,
+					tt : tt,
+					pt : pt
 				},
 				function(response)
 				{