Permalink
Browse files

zen coding on by default - but do not use tab for expansion

  • Loading branch information...
1 parent e519150 commit 7978b648665ab51d43ea952a44b2174331c51e35 @remy remy committed Oct 9, 2012
Showing with 5 additions and 3 deletions.
  1. +1 −1 package.json
  2. +1 −1 public/js/editors/panel.js
  3. +1 −1 public/js/vendor/codemirror2/zen_codemirror.js
  4. +2 −0 views/index.html
View
2 package.json
@@ -7,7 +7,7 @@
"name": "jsbin",
"description": "Collaborative JavaScript Debugging App",
"main": "./lib/app",
- "version": "3.0.12",
+ "version": "3.0.13",
"preferGlobal": "true",
"homepage": "http://jsbin.com",
"bin": "./bin/jsbin",
View
2 public/js/editors/panel.js
@@ -103,7 +103,7 @@ var Panel = function (name, settings) {
}
// Add Zen Coding to html pane
- if (name === 'html' && jsbin.settings.editor.zen === true) {
+ if (name === 'html') {
$.extend(cmSettings, {
syntax: 'html', /* define Zen Coding syntax */
profile: 'html', /* define Zen Coding output profile */
View
2 public/js/vendor/codemirror2/zen_codemirror.js
@@ -5604,7 +5604,7 @@ var zen_editor = (function(){
// add default shortcuts
addShortcut('Meta+E', 'Expand Abbreviation');
- addShortcut('Tab', 'Expand Abbreviation');
+ // addShortcut('Tab', 'Expand Abbreviation');
addShortcut('Meta+D', 'Balance Tag Outward');
addShortcut('Shift+Meta+D', 'Balance Tag inward');
addShortcut('Shift+Meta+A', 'Wrap with Abbreviation');
View
2 views/index.html
@@ -329,6 +329,8 @@
<td>cmd + ] (or shift + tab)</td>
<td>Unindents selected lines</td>
</tr>
+
+ <tr><td colspan="2"><br>JS Bin also supports <a href="https://github.com/sergeche/zen-coding" target="_blank">Emmet/Zen Coding</a> shortcuts (except tab key)</td></tr>
<tr><td colspan="2"><br><input type="checkbox" id="disablekeys"> Disable all keyboard shortcuts <small>(refresh required)</small></td></tr>
</tbody>
</table>

0 comments on commit 7978b64

Please sign in to comment.