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/handlebars | |
| 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/handlebars')
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/mode/handlebars/handlebars.js | 19 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/mode/handlebars/index.html | 15 |
2 files changed, 17 insertions, 17 deletions
diff --git a/public/vendor/codemirror/mode/handlebars/handlebars.js b/public/vendor/codemirror/mode/handlebars/handlebars.js index 40dfea42..2174e538 100755..100644 --- a/public/vendor/codemirror/mode/handlebars/handlebars.js +++ b/public/vendor/codemirror/mode/handlebars/handlebars.js @@ -3,15 +3,15 @@ (function(mod) { if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../../addon/mode/simple")); + mod(require("../../lib/codemirror"), require("../../addon/mode/simple"), require("../../addon/mode/multiplex")); else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../../addon/mode/simple"], mod); + define(["../../lib/codemirror", "../../addon/mode/simple", "../../addon/mode/multiplex"], mod); else // Plain browser env mod(CodeMirror); })(function(CodeMirror) { "use strict"; - CodeMirror.defineSimpleMode("handlebars", { + CodeMirror.defineSimpleMode("handlebars-tags", { start: [ { regex: /\{\{!--/, push: "dash_comment", token: "comment" }, { regex: /\{\{!/, push: "comment", token: "comment" }, @@ -21,8 +21,8 @@ { regex: /\}\}/, pop: true, token: "tag" }, // Double and single quotes - { regex: /"(?:[^\\]|\\.)*?"/, token: "string" }, - { regex: /'(?:[^\\]|\\.)*?'/, token: "string" }, + { regex: /"(?:[^\\"]|\\.)*"?/, token: "string" }, + { regex: /'(?:[^\\']|\\.)*'?/, token: "string" }, // Handlebars keywords { regex: />|[#\/]([A-Za-z_]\w*)/, token: "keyword" }, @@ -49,5 +49,14 @@ ] }); + CodeMirror.defineMode("handlebars", function(config, parserConfig) { + var handlebars = CodeMirror.getMode(config, "handlebars-tags"); + if (!parserConfig || !parserConfig.base) return handlebars; + return CodeMirror.multiplexingMode( + CodeMirror.getMode(config, parserConfig.base), + {open: "{{", close: "}}", mode: handlebars, parseDelimiters: true} + ); + }); + CodeMirror.defineMIME("text/x-handlebars-template", "handlebars"); }); diff --git a/public/vendor/codemirror/mode/handlebars/index.html b/public/vendor/codemirror/mode/handlebars/index.html index beaef87a..4f82d602 100755..100644 --- a/public/vendor/codemirror/mode/handlebars/index.html +++ b/public/vendor/codemirror/mode/handlebars/index.html @@ -1,4 +1,4 @@ -<!doctype html> +<!doctype html> <title>CodeMirror: Handlebars mode</title> <meta charset="utf-8"/> @@ -61,22 +61,13 @@ </textarea></form> <script> - CodeMirror.defineMode("htmlhandlebars", function(config) { - return CodeMirror.multiplexingMode( - CodeMirror.getMode(config, "text/html"), - {open: "{{", close: "}}", - mode: CodeMirror.getMode(config, "handlebars"), - parseDelimiters: true}); - }); - var editor = CodeMirror.fromTextArea(document.getElementById("code"), { lineNumbers: true, matchBrackets: true, - mode: "htmlhandlebars" + mode: {name: "handlebars", base: "text/html"} }); </script> - </script> - + <p>Handlebars syntax highlighting for CodeMirror.</p> <p><strong>MIME types defined:</strong> <code>text/x-handlebars-template</code></p> |