Commit 1a198dc4 authored by jgould's avatar jgould

mac shortcut

parent 92f25fa2
...@@ -2,7 +2,7 @@ morpheus.NewHeatMapTool = function() { ...@@ -2,7 +2,7 @@ morpheus.NewHeatMapTool = function() {
}; };
morpheus.NewHeatMapTool.prototype = { morpheus.NewHeatMapTool.prototype = {
toString : function() { toString : function() {
return 'New Heat Map (' + morpheus.Util.COMMAND_KEY + '+X)'; return 'New Heat Map (' + morpheus.Util.COMMAND_KEY + 'X)';
}, },
// gui : function() { // gui : function() {
// return [ { // return [ {
......
...@@ -177,19 +177,19 @@ morpheus.HeatMapToolBar = function(controller) { ...@@ -177,19 +177,19 @@ morpheus.HeatMapToolBar = function(controller) {
toolbarHtml toolbarHtml
.push('<button name="saveImage" data-toggle="tooltip" title="Save Image (' .push('<button name="saveImage" data-toggle="tooltip" title="Save Image ('
+ morpheus.Util.COMMAND_KEY + 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) { if (controller.options.toolbar.saveDataset) {
toolbarHtml toolbarHtml
.push('<button name="saveDataset" data-toggle="tooltip" title="Save Dataset (' .push('<button name="saveDataset" data-toggle="tooltip" title="Save Dataset ('
+ morpheus.Util.COMMAND_KEY + 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) { if (controller.options.toolbar.openFile) {
toolbarHtml toolbarHtml
.push('<button name="openFile" data-toggle="tooltip" title="Open File (' .push('<button name="openFile" data-toggle="tooltip" title="Open File ('
+ morpheus.Util.COMMAND_KEY + 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>'); toolbarHtml.push('<div class="morpheus-button-divider"></div>');
if (controller.options.toolbar.filter) { if (controller.options.toolbar.filter) {
......
...@@ -306,7 +306,7 @@ if (typeof navigator !== 'undefined') { ...@@ -306,7 +306,7 @@ if (typeof navigator !== 'undefined') {
morpheus.Util.IS_MAC = navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) ? true morpheus.Util.IS_MAC = navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) ? true
: false; : 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) { morpheus.Util.hammer = function(el, recognizers) {
var hammer = new Hammer(el, { var hammer = new Hammer(el, {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment