diff options
| author | Wu Cheng-Han | 2016-01-17 14:28:04 -0600 |
|---|---|---|
| committer | Wu Cheng-Han | 2016-01-17 14:28:04 -0600 |
| commit | eaa8ccaccb1091820d0a8d1223996a6dd057347d (patch) | |
| tree | 6b4aaa3b3d1a2fed68147510142663222533775a /public/vendor/codemirror/mode/haml | |
| parent | ce65e58096d57ace02723d11a125673f9d48c293 (diff) | |
Upgrade CodeMirror to 5.10.1 and now support fullscreen, jump-to-line in editor
Diffstat (limited to 'public/vendor/codemirror/mode/haml')
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/mode/haml/haml.js | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/mode/haml/index.html | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/mode/haml/test.js | 0 |
3 files changed, 4 insertions, 2 deletions
diff --git a/public/vendor/codemirror/mode/haml/haml.js b/public/vendor/codemirror/mode/haml/haml.js index 8fe63b02..03ce8335 100755..100644 --- a/public/vendor/codemirror/mode/haml/haml.js +++ b/public/vendor/codemirror/mode/haml/haml.js @@ -85,8 +85,10 @@ state.tokenize = rubyInQuote(")"); return state.tokenize(stream, state); } else if (ch == "{") { - state.tokenize = rubyInQuote("}"); - return state.tokenize(stream, state); + if (!stream.match(/^\{%.*/)) { + state.tokenize = rubyInQuote("}"); + return state.tokenize(stream, state); + } } } diff --git a/public/vendor/codemirror/mode/haml/index.html b/public/vendor/codemirror/mode/haml/index.html index 2894a938..2894a938 100755..100644 --- a/public/vendor/codemirror/mode/haml/index.html +++ b/public/vendor/codemirror/mode/haml/index.html diff --git a/public/vendor/codemirror/mode/haml/test.js b/public/vendor/codemirror/mode/haml/test.js index 508458a4..508458a4 100755..100644 --- a/public/vendor/codemirror/mode/haml/test.js +++ b/public/vendor/codemirror/mode/haml/test.js |