diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /imports/codemirror/lib/util/foldcode.js | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
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; |