Webionite
/
haste-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed Shortcut scheme for Mac

This commit is contained in:
Amer Almadani 2016-09-22 23:07:04 +03:00 committed by GitHub
parent 0ed86335e0
commit baea36a6f0
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
static/application.js
View File

@ -258,13 +258,31 @@ haste.prototype.lockDocument = function() {
haste.prototype.configureButtons = function() { haste.prototype.configureButtons = function() {
var _this = this; var _this = this;
var save_desc = "control + alt + s";
var save_shortcut = function(evt) {return evt.ctrlKey && evt.altKey &&(evt.keyCode === 83)};
var new_desc = "control + alt + n";
var new_shortcut = function(evt) {return evt.ctrlKey && evt.altKey && evt.keyCode === 78};
var duplicate_desc = "control + alt + d";
var duplicate_shortcut = function(evt) {return _this.doc.locked && evt.ctrlKey && evt.altKey && evt.keyCode === 68};
/* navigator.appVersion.indexOf("Mac")!=-1; */
if (navigator.appVersion.indexOf("Mac")!=-1) {
save_desc = "control + s";
save_shortcut = function(evt) {return evt.ctrlKey && (evt.keyCode === 83)};
new_desc = "control + n";
new_shortcut = function(evt) {return evt.ctrlKey && evt.keyCode === 78};
duplicate_desc = "control + d";
duplicate_shortcut = function(evt) {return _this.doc.locked && evt.ctrlKey && evt.keyCode === 68;}
}
this.buttons = [ this.buttons = [
{ {
$where: $('#box2 .save'), $where: $('#box2 .save'),
label: 'Save', label: 'Save',
shortcutDescription: 'control + alt + s', shortcutDescription: save_desc,
shortcut: function(evt) { shortcut: function(evt) {
return evt.ctrlKey && evt.altKey && (evt.keyCode === 83); return save_shortcut(evt);
}, },
action: function() { action: function() {
if (_this.$textarea.val().replace(/^\s+|\s+$/g, '') !== '') { if (_this.$textarea.val().replace(/^\s+|\s+$/g, '') !== '') {
@ -276,9 +294,9 @@ haste.prototype.configureButtons = function() {
$where: $('#box2 .new'), $where: $('#box2 .new'),
label: 'New', label: 'New',
shortcut: function(evt) { shortcut: function(evt) {
return evt.ctrlKey && evt.altKey && evt.keyCode === 78 return new_shortcut(evt);
}, },
shortcutDescription: 'control + atl + n', shortcutDescription: new_desc,
action: function() { action: function() {
_this.newDocument(!_this.doc.key); _this.newDocument(!_this.doc.key);
} }
@ -287,9 +305,9 @@ haste.prototype.configureButtons = function() {
$where: $('#box2 .duplicate'), $where: $('#box2 .duplicate'),
label: 'Duplicate & Edit', label: 'Duplicate & Edit',
shortcut: function(evt) { shortcut: function(evt) {
return _this.doc.locked && evt.ctrlKey && evt.altKey && evt.keyCode === 68; return duplicate_shortcut(evt);
}, },
shortcutDescription: 'control + alt + d', shortcutDescription: duplicate_desc,
action: function() { action: function() {
_this.duplicateDocument(); _this.duplicateDocument();
} }