From 1a198dc4ca77a8d45d6442af90d341312809e2b8 Mon Sep 17 00:00:00 2001
From: jgould <jgould@broadinstitute.org>
Date: Thu, 14 Apr 2016 16:33:28 -0400
Subject: [PATCH] mac shortcut

---
 src/tools/new_heat_map_tool.js | 2 +-
 src/ui/heat_map_toolbar.js     | 6 +++---
 src/util/util.js               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tools/new_heat_map_tool.js b/src/tools/new_heat_map_tool.js
index 1070a31..37caaff 100644
--- a/src/tools/new_heat_map_tool.js
+++ b/src/tools/new_heat_map_tool.js
@@ -2,7 +2,7 @@ morpheus.NewHeatMapTool = function() {
 };
 morpheus.NewHeatMapTool.prototype = {
 	toString : function() {
-		return 'New Heat Map (' + morpheus.Util.COMMAND_KEY + '+X)';
+		return 'New Heat Map (' + morpheus.Util.COMMAND_KEY + 'X)';
 	},
 	// gui : function() {
 	// return [ {
diff --git a/src/ui/heat_map_toolbar.js b/src/ui/heat_map_toolbar.js
index 3dc49e8..108be53 100644
--- a/src/ui/heat_map_toolbar.js
+++ b/src/ui/heat_map_toolbar.js
@@ -177,19 +177,19 @@ morpheus.HeatMapToolBar = function(controller) {
 		toolbarHtml
 				.push('<button name="saveImage" data-toggle="tooltip" title="Save Image ('
 						+ morpheus.Util.COMMAND_KEY
-						+ '+S)" type="button" class="btn btn-default btn-xs"><span class="fa fa-file-image-o"></span></button>');
+						+ 'S)" type="button" class="btn btn-default btn-xs"><span class="fa fa-file-image-o"></span></button>');
 	}
 	if (controller.options.toolbar.saveDataset) {
 		toolbarHtml
 				.push('<button name="saveDataset" data-toggle="tooltip" title="Save Dataset ('
 						+ morpheus.Util.COMMAND_KEY
-						+ '+Shift+S)" type="button" class="btn btn-default btn-xs"><span class="fa fa-floppy-o"></span></button>');
+						+ 'Shift+S)" type="button" class="btn btn-default btn-xs"><span class="fa fa-floppy-o"></span></button>');
 	}
 	if (controller.options.toolbar.openFile) {
 		toolbarHtml
 				.push('<button name="openFile" data-toggle="tooltip" title="Open File ('
 						+ morpheus.Util.COMMAND_KEY
-						+ '+O)" type="button" class="btn btn-default btn-xs"><span class="fa fa-folder-open-o"></span></button>');
+						+ 'O)" type="button" class="btn btn-default btn-xs"><span class="fa fa-folder-open-o"></span></button>');
 	}
 	toolbarHtml.push('<div class="morpheus-button-divider"></div>');
 	if (controller.options.toolbar.filter) {
diff --git a/src/util/util.js b/src/util/util.js
index f09d05c..861ab43 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -306,7 +306,7 @@ if (typeof navigator !== 'undefined') {
 	morpheus.Util.IS_MAC = navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) ? true
 			: false;
 }
-morpheus.Util.COMMAND_KEY = morpheus.Util.IS_MAC ? '&#8984;' : 'Ctrl';
+morpheus.Util.COMMAND_KEY = morpheus.Util.IS_MAC ? '&#8984;' : '+Ctrl';
 
 morpheus.Util.hammer = function(el, recognizers) {
 	var hammer = new Hammer(el, {
-- 
GitLab