diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/lib/util/foldcode.js | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'imports/codemirror/lib/util/foldcode.js')
| -rw-r--r-- | imports/codemirror/lib/util/foldcode.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/lib/util/foldcode.js b/imports/codemirror/lib/util/foldcode.js index 50268a8b..b700d860 100644 --- a/imports/codemirror/lib/util/foldcode.js +++ b/imports/codemirror/lib/util/foldcode.js | |||
| @@ -80,7 +80,7 @@ CodeMirror.tagRangeFinder = function(cm, line) { | |||
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | if (found) { | 82 | if (found) { |
| 83 | var startTag = "(\\<\\/" + tag + "\\>)|(\\<" + tag + "\\>)|(\\<" + tag + "\s)|(\\<" + tag + "$)"; | 83 | var startTag = "(\\<\\/" + tag + "\\>)|(\\<" + tag + "\\>)|(\\<" + tag + "\\s)|(\\<" + tag + "$)"; |
| 84 | var startTagRegExp = new RegExp(startTag, "g"); | 84 | var startTagRegExp = new RegExp(startTag, "g"); |
| 85 | var endTag = "</" + tag + ">"; | 85 | var endTag = "</" + tag + ">"; |
| 86 | var depth = 1; | 86 | var depth = 1; |