diff --git a/src/tools/new_heat_map_tool.js b/src/tools/new_heat_map_tool.js index 1070a317b697296f9b10e89d0a02705b4452bd3d..37caaffc0edb2acac4b157ead8a9720251c89738 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 3dc49e827dbe11d16b6d845dc4312ed07decb827..108be53ae2f4d7874454b5becdae39fd9c91c2a5 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(''); + + 'S)" type="button" class="btn btn-default btn-xs">'); } if (controller.options.toolbar.saveDataset) { toolbarHtml .push(''); + + 'Shift+S)" type="button" class="btn btn-default btn-xs">'); } if (controller.options.toolbar.openFile) { toolbarHtml .push(''); + + 'O)" type="button" class="btn btn-default btn-xs">'); } toolbarHtml.push('
'); if (controller.options.toolbar.filter) { diff --git a/src/util/util.js b/src/util/util.js index f09d05c6937cc60ef8a39b601f90961e453405c5..861ab4335c2fdefc18e79563d6e49f536bc5ea82 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 ? '⌘' : 'Ctrl'; +morpheus.Util.COMMAND_KEY = morpheus.Util.IS_MAC ? '⌘' : '+Ctrl'; morpheus.Util.hammer = function(el, recognizers) { var hammer = new Hammer(el, {