Merge branch 'ToolsPanel' of github.com:gskinner/regexr into ToolsPanel

Author: gskinner

js/index.template.js

@@ -148,7 +148,7 @@
 			RegExrShared.ServerModel.getPatternByID(id).then(function (data) {
 				RegExrShared.ExpressionModel.setLastSave(data);
 				var pattern = $.parsePattern(data.pattern);
-				var state = data.state ? JSON.parse(data.state) : null;
+				var state = data.state;
 				// legacy support:
 				if (state && data.replace) {
 					state.toolValue = data.replace;

js/net/ServerModel.js

@@ -86,7 +86,13 @@ s.getPatternByID = function (patternID) {
  * @returns {*}
  */
 s.formatPattern = function(data) {
-	var results = data.results;
+	var results = null;
+
+	if (data.results == null) {
+		results = [data];
+	} else {
+		results = data.results;
+	}
 
 	for (var i=0;i<results.length;i++) {
 		var result =results[i];

js/views/DocView.js

@@ -681,7 +681,7 @@ p.onToolsClick = function (evt) {
 	this.showTools(true);
 	var tool = evt.target.dataset.tool;
 	if (tool) { this.setTool(tool); }
-	Tracking.event("tools", !this.toolsEnabled ? "show" : "hide"); // TODO: update.
+	Tracking.event("tools", (!this.toolsEnabled ? "show" : "hide")+":"+tool);
 };
 
 p.onFlagsMenuChange = function (evt) {