Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Upgrade to CodeMirror 3.1

Now we need to specifically include the bracket matching extension.
  • Loading branch information...
commit e2a4237e830646c5cfcf0a8ca08763a61a798a5d 1 parent be921a4
@jasongrout jasongrout authored
Showing with 4 additions and 3 deletions.
  1. +3 −2 Makefile
  2. +1 −1  submodules/codemirror
View
5 Makefile
@@ -14,6 +14,7 @@ sagecell-css = static/sagecell.css
sockjs-client = static/sockjs.js
codemirror-css = submodules/codemirror/lib/codemirror.css
codemirror = submodules/codemirror/lib/codemirror.js
+cm-brackets = submodules/codemirror/addon/edit/matchbrackets.js
cm-python-mode = submodules/codemirror/mode/python/python.js
cm-xml-mode = submodules/codemirror/mode/xml/xml.js
cm-html-mode = submodules/codemirror/mode/htmlmixed/htmlmixed.js
@@ -49,8 +50,8 @@ $(all-min-js): $(jsmin-bin) $(all-js)
$(all-js): $(ip-namespace) $(wrap-js) $(codemirror) $(cm-python-mode) \
$(cm-xml-mode) $(cm-html-mode) $(cm-js-mode) $(cm-css-mode) \
- $(cm-r-mode) $(jmol-js) $(sockjs-client) $(compute_server) $(sagecell)
- cat $(codemirror) $(cm-python-mode) $(cm-xml-mode) $(cm-html-mode) \
+ $(cm-r-mode) $(cm-brackets) $(jmol-js) $(sockjs-client) $(compute_server) $(sagecell)
+ cat $(codemirror) $(cm-brackets) $(cm-python-mode) $(cm-xml-mode) $(cm-html-mode) \
$(cm-js-mode) $(cm-css-mode) $(cm-r-mode) $(jmol-js) $(ip-namespace) \
$(wrap-js) > $(all-js)
echo ';' >> $(all-js)
2  submodules/codemirror
@@ -1 +1 @@
-Subproject commit 805b5a44bdfd4559d6b3893969a32842594d2b2c
+Subproject commit 545aeb74f6800dcaf6acead1bfc14c4eef99c9eb
Please sign in to comment.
Something went wrong with that request. Please try again.