jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code folding cleanups

Browse source
This commit is contained in:
Fabian Jakobs 2011-12-01 11:27:26 +01:00
commit f45b4ed783
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ace/edit_session/folding.js
View file

@ -569,7 +569,8 @@ function Folding() {
var iterator = new TokenIterator(this, row, column); var iterator = new TokenIterator(this, row, column);
var token = iterator.getCurrentToken(); var token = iterator.getCurrentToken();
if (token && /^comment|string/.test(token.type)) { if (token && /^comment|string/.test(token.type)) {
var range = new Range; var range = new Range();
var t;
do { do {
t = iterator.stepBackward(); t = iterator.stepBackward();
} while(t && t.type == token.type) } while(t && t.type == token.type)
@ -656,7 +657,7 @@ function Folding() {
return; return;
} }
range = this.getFoldWidgetRange(row); var range = this.getFoldWidgetRange(row);
if (range) if (range)
this.addFold("...", range); this.addFold("...", range);
} }
@ -713,7 +714,7 @@ Folding.commonFoldingRules = {
} }
if (endRow > startRow) { if (endRow > startRow) {
endColumn = this.getLine(endRow).length; var endColumn = this.getLine(endRow).length;
return new Range(startRow, startColumn, endRow, endColumn); return new Range(startRow, startColumn, endRow, endColumn);
} }
}, },

4
lib/ace/layer/gutter.js
View file

@ -127,9 +127,9 @@ var Gutter = function(parentEl) {
if (foldWidgets) { if (foldWidgets) {
var c = foldWidgets[i]; var c = foldWidgets[i];
if (c == null) if (!c)
c = foldWidgets[i] = this.session.getFoldWidget(i); c = foldWidgets[i] = this.session.getFoldWidget(i);
if(c) if (c)
html.push( html.push(
"<span class='ace_fold-widget ", c, "<span class='ace_fold-widget ", c,
c == "start" && i == foldStart && i < fold.end.row ? " closed" : " open", c == "start" && i == foldStart && i < fold.end.row ? " closed" : " open",