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

add hotkey for saving with cmd + s

This commit is contained in:
Riku Rouvila 2013-06-17 19:43:14 +03:00
parent abb49f2cf3
commit 2daf0eceed
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
static/application.js
View File

@ -1,11 +1,11 @@
///// represents a single document ///// represents a single document
var haste_document = function() { var HasteDocument = function() {
this.locked = false; this.locked = false;
}; };
// Escapes HTML tag characters // Escapes HTML tag characters
haste_document.prototype.htmlEscape = function(s) { HasteDocument.prototype.htmlEscape = function(s) {
return s return s
.replace(/&/g, '&') .replace(/&/g, '&')
.replace(/>/g, '>') .replace(/>/g, '>')
@ -14,7 +14,7 @@ haste_document.prototype.htmlEscape = function(s) {
}; };
// Get this document from the server and lock it here // Get this document from the server and lock it here
haste_document.prototype.load = function(key, callback, lang) { HasteDocument.prototype.load = function(key, callback, lang) {
var _this = this; var _this = this;
$.ajax('/documents/' + key, { $.ajax('/documents/' + key, {
type: 'get', type: 'get',
@ -52,7 +52,7 @@ haste_document.prototype.load = function(key, callback, lang) {
}; };
// Save this document to the server and lock it here // Save this document to the server and lock it here
haste_document.prototype.save = function(data, callback) { HasteDocument.prototype.save = function(data, callback) {
if (this.locked) { if (this.locked) {
return false; return false;
} }
@ -146,7 +146,7 @@ haste.prototype.configureKey = function(enable) {
// and set up for a new one // and set up for a new one
haste.prototype.newDocument = function(hideHistory) { haste.prototype.newDocument = function(hideHistory) {
this.$box.hide(); this.$box.hide();
this.doc = new haste_document(); this.doc = new HasteDocument();
if (!hideHistory) { if (!hideHistory) {
window.history.pushState(null, this.appName, '/'); window.history.pushState(null, this.appName, '/');
} }
@ -207,7 +207,7 @@ haste.prototype.loadDocument = function(key) {
var parts = key.split('.', 2); var parts = key.split('.', 2);
// Ask for what we want // Ask for what we want
var _this = this; var _this = this;
_this.doc = new haste_document(); _this.doc = new HasteDocument();
_this.doc.load(parts[0], function(ret) { _this.doc.load(parts[0], function(ret) {
if (ret) { if (ret) {
_this.$code.html(ret.value); _this.$code.html(ret.value);
@ -263,7 +263,8 @@ haste.prototype.configureButtons = function() {
label: 'Save', label: 'Save',
shortcutDescription: 'control + s', shortcutDescription: 'control + s',
shortcut: function(evt) { shortcut: function(evt) {
return evt.ctrlKey && (evt.keyCode === 83);
return (evt.ctrlKey || evt.metaKey) && evt.keyCode === 83;
}, },
action: function() { action: function() {
if (_this.$textarea.val().replace(/^\s+|\s+$/g, '') !== '') { if (_this.$textarea.val().replace(/^\s+|\s+$/g, '') !== '') {

2
static/application.min.js vendored
View File

File diff suppressed because one or more lines are too long