diff options
Diffstat (limited to 'js/controllers')
-rw-r--r-- | js/controllers/code-editor-controller.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js index f4ca6018..0223165f 100644 --- a/js/controllers/code-editor-controller.js +++ b/js/controllers/code-editor-controller.js | |||
@@ -140,16 +140,14 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone | |||
140 | || (keyEvent.keyCode === 190)//period | 140 | || (keyEvent.keyCode === 190)//period |
141 | || (keyEvent.keyCode === 189)//underscore, dash | 141 | || (keyEvent.keyCode === 189)//underscore, dash |
142 | ) | 142 | ) |
143 | && !( (keyEvent.keyCode === 219)//open bracket [ | 143 | && !(keyEvent.ctrlKey //ctrl |
144 | || (keyEvent.ctrlKey || keyEvent.metaKey)//ctrl | 144 | || keyEvent.metaKey//cmd |
145 | || (keyEvent.keyCode === 219)//open bracket [ | ||
145 | || (keyEvent.keyCode === 221)//close bracket ] | 146 | || (keyEvent.keyCode === 221)//close bracket ] |
146 | || (keyEvent.shiftKey && keyEvent.keyCode === 219)//open bracket { | 147 | || (keyEvent.shiftKey && keyEvent.keyCode === 219)//open bracket { |
147 | || (keyEvent.shiftKey && keyEvent.keyCode === 221)//close bracket } | 148 | || (keyEvent.shiftKey && keyEvent.keyCode === 221)//close bracket } |
148 | || (keyEvent.shiftKey && keyEvent.keyCode === 57)//open bracket ( | 149 | || (keyEvent.shiftKey && keyEvent.keyCode === 57)//open bracket ( |
149 | || (keyEvent.shiftKey && keyEvent.keyCode === 48)//close bracket ) | 150 | || (keyEvent.shiftKey && keyEvent.keyCode === 48)//close bracket ) |
150 | || ((keyEvent.keyCode === 83) && (keyEvent.ctrlKey || keyEvent.metaKey))//ctrl+S | ||
151 | || ((keyEvent.keyCode === 90) && (keyEvent.ctrlKey || keyEvent.metaKey))//ctrl+z | ||
152 | || ((keyEvent.keyCode === 89) && (keyEvent.ctrlKey || keyEvent.metaKey))//ctrl+y | ||
153 | ) | 151 | ) |
154 | ){ | 152 | ){ |
155 | status = true; | 153 | status = true; |