mirrors/haste-server
1
0
Fork 0
mirror of https://github.com/seejohnrun/haste-server.git synced 2024-11-25 05:51:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into production

Browse source
This commit is contained in:
John Crepezzi 2012-12-29 18:15:32 -05:00
commit 5d8bd2e6f8
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -20,6 +20,14 @@ to do things like:
which will output a URL to share containing the contents of `cat something`'s which will output a URL to share containing the contents of `cat something`'s
STDOUT. Check the README there for more details and usages. STDOUT. Check the README there for more details and usages.
## Support
Please consider paying what you feel this project is worth:
<a href="https://www.stripeme.com/pay/1r2f">
<img alt="Pay" src="https://www.stripeme.com/pay.jpg" />
</a>
## Tested Browsers ## Tested Browsers
* Firefox 8 * Firefox 8

6
static/application.js
View file

@ -168,7 +168,7 @@ haste.extensionMap = {
lua: 'lua', pas: 'delphi', java: 'java', cpp: 'cpp', cc: 'cpp', m: 'objectivec', lua: 'lua', pas: 'delphi', java: 'java', cpp: 'cpp', cc: 'cpp', m: 'objectivec',
vala: 'vala', cs: 'cs', sql: 'sql', sm: 'smalltalk', lisp: 'lisp', ini: 'ini', vala: 'vala', cs: 'cs', sql: 'sql', sm: 'smalltalk', lisp: 'lisp', ini: 'ini',
diff: 'diff', bash: 'bash', sh: 'bash', tex: 'tex', erl: 'erlang', hs: 'haskell', diff: 'diff', bash: 'bash', sh: 'bash', tex: 'tex', erl: 'erlang', hs: 'haskell',
md: 'markdown', txt: '', coffee: 'coffee' md: 'markdown', txt: '', coffee: 'coffee', json: 'javascript'
}; };
// Look up the extension preferred for a type // Look up the extension preferred for a type
@ -308,9 +308,9 @@ haste.prototype.configureButtons = function() {
$where: $('#box2 .twitter'), $where: $('#box2 .twitter'),
label: 'Twitter', label: 'Twitter',
shortcut: function(evt) { shortcut: function(evt) {
return _this.options.twitter && _this.doc.locked && evt.ctrlKey && evt.keyCode == 84; return _this.options.twitter && _this.doc.locked && evt.shiftKey && evt.ctrlKey && evt.keyCode == 84;
}, },
shortcutDescription: 'control + t', shortcutDescription: 'control + shift + t',
action: function() { action: function() {
window.open('https://twitter.com/share?url=' + encodeURI(window.location.href)); window.open('https://twitter.com/share?url=' + encodeURI(window.location.href));
} }

2
static/application.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
static/solarized_dark.css
View file

@ -17,6 +17,8 @@ pre .lisp .string,
pre .javadoc { pre .javadoc {
color: #586e75; color: #586e75;
font-style: italic; font-style: italic;
display: inline-block;
line-height: 1em;
} }
pre .keyword, pre .keyword,