diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/lib/util/foldcode.js | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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; |