diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /imports/codemirror/lib/util/foldcode.js | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
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; |