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/addon/fold | |
| parent | ce65e58096d57ace02723d11a125673f9d48c293 (diff) | |
Upgrade CodeMirror to 5.10.1 and now support fullscreen, jump-to-line in editor
Diffstat (limited to 'public/vendor/codemirror/addon/fold')
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/addon/fold/brace-fold.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/addon/fold/comment-fold.js | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/addon/fold/foldcode.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/addon/fold/foldgutter.css | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/addon/fold/foldgutter.js | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/addon/fold/indent-fold.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/addon/fold/markdown-fold.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | public/vendor/codemirror/addon/fold/xml-fold.js | 0 | 
8 files changed, 5 insertions, 3 deletions
| diff --git a/public/vendor/codemirror/addon/fold/brace-fold.js b/public/vendor/codemirror/addon/fold/brace-fold.js index 1605f6c2..1605f6c2 100755..100644 --- a/public/vendor/codemirror/addon/fold/brace-fold.js +++ b/public/vendor/codemirror/addon/fold/brace-fold.js diff --git a/public/vendor/codemirror/addon/fold/comment-fold.js b/public/vendor/codemirror/addon/fold/comment-fold.js index b75db7ea..60fa3e43 100755..100644 --- a/public/vendor/codemirror/addon/fold/comment-fold.js +++ b/public/vendor/codemirror/addon/fold/comment-fold.js @@ -28,7 +28,9 @@ CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {        continue;      }      if (pass == 1 && found < start.ch) return; -    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1)))) { +    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1))) && +        (lineText.slice(found - endToken.length, found) == endToken || +         !/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found))))) {        startCh = found + startToken.length;        break;      } diff --git a/public/vendor/codemirror/addon/fold/foldcode.js b/public/vendor/codemirror/addon/fold/foldcode.js index 62911f93..62911f93 100755..100644 --- a/public/vendor/codemirror/addon/fold/foldcode.js +++ b/public/vendor/codemirror/addon/fold/foldcode.js diff --git a/public/vendor/codemirror/addon/fold/foldgutter.css b/public/vendor/codemirror/addon/fold/foldgutter.css index ad19ae2d..ad19ae2d 100755..100644 --- a/public/vendor/codemirror/addon/fold/foldgutter.css +++ b/public/vendor/codemirror/addon/fold/foldgutter.css diff --git a/public/vendor/codemirror/addon/fold/foldgutter.js b/public/vendor/codemirror/addon/fold/foldgutter.js index ed7bd87d..f101e267 100755..100644 --- a/public/vendor/codemirror/addon/fold/foldgutter.js +++ b/public/vendor/codemirror/addon/fold/foldgutter.js @@ -20,7 +20,7 @@        cm.off("viewportChange", onViewportChange);        cm.off("fold", onFold);        cm.off("unfold", onFold); -      cm.off("swapDoc", updateInViewport); +      cm.off("swapDoc", onChange);      }      if (val) {        cm.state.foldGutter = new State(parseOptions(val)); @@ -30,7 +30,7 @@        cm.on("viewportChange", onViewportChange);        cm.on("fold", onFold);        cm.on("unfold", onFold); -      cm.on("swapDoc", updateInViewport); +      cm.on("swapDoc", onChange);      }    }); diff --git a/public/vendor/codemirror/addon/fold/indent-fold.js b/public/vendor/codemirror/addon/fold/indent-fold.js index e29f15e9..e29f15e9 100755..100644 --- a/public/vendor/codemirror/addon/fold/indent-fold.js +++ b/public/vendor/codemirror/addon/fold/indent-fold.js diff --git a/public/vendor/codemirror/addon/fold/markdown-fold.js b/public/vendor/codemirror/addon/fold/markdown-fold.js index ce84c946..ce84c946 100755..100644 --- a/public/vendor/codemirror/addon/fold/markdown-fold.js +++ b/public/vendor/codemirror/addon/fold/markdown-fold.js diff --git a/public/vendor/codemirror/addon/fold/xml-fold.js b/public/vendor/codemirror/addon/fold/xml-fold.js index 504727f3..504727f3 100755..100644 --- a/public/vendor/codemirror/addon/fold/xml-fold.js +++ b/public/vendor/codemirror/addon/fold/xml-fold.js | 
