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

cleanup

Browse source
This commit is contained in:
Fabian Jakobs 2011-12-13 13:50:15 +01:00
commit e8f35d3cd2
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -541,22 +541,26 @@ function Folding() {
if (fold) { if (fold) {
this.expandFold(fold); this.expandFold(fold);
return; return;
} else if (bracketPos = this.findMatchingBracket(cursor)) { }
else if (bracketPos = this.findMatchingBracket(cursor)) {
if (range.comparePoint(bracketPos) == 1) { if (range.comparePoint(bracketPos) == 1) {
range.end = bracketPos; range.end = bracketPos;
} else { }
else {
range.start = bracketPos; range.start = bracketPos;
range.start.column++; range.start.column++;
range.end.column--; range.end.column--;
} }
} else if (bracketPos = this.findMatchingBracket({row: cursor.row, column: cursor.column + 1})) { }
else if (bracketPos = this.findMatchingBracket({row: cursor.row, column: cursor.column + 1})) {
if (range.comparePoint(bracketPos) == 1) if (range.comparePoint(bracketPos) == 1)
range.end = bracketPos; range.end = bracketPos;
else else
range.start = bracketPos; range.start = bracketPos;
range.start.column++; range.start.column++;
} else { }
else {
range = this.getCommentFoldRange(cursor.row, cursor.column) || range; range = this.getCommentFoldRange(cursor.row, cursor.column) || range;
} }
} else { } else {
@ -564,7 +568,8 @@ function Folding() {
if (tryToUnfold && folds.length) { if (tryToUnfold && folds.length) {
this.expandFolds(folds); this.expandFolds(folds);
return; return;
} else if (folds.length == 1 ) { }
else if (folds.length == 1 ) {
fold = folds[0]; fold = folds[0];
} }
} }
@ -572,7 +577,7 @@ function Folding() {
if (!fold) if (!fold)
fold = this.getFoldAt(range.start.row, range.start.column); fold = this.getFoldAt(range.start.row, range.start.column);
if (fold && fold.range.toString() == range.toString()){ if (fold && fold.range.toString() == range.toString()) {
this.expandFold(fold); this.expandFold(fold);
return; return;
} }

4
lib/ace/mouse/default_handlers.js
View file

@ -41,7 +41,6 @@ define(function(require, exports, module) {
var event = require("../lib/event"); var event = require("../lib/event");
var dom = require("../lib/dom"); var dom = require("../lib/dom");
var EventEmitter = require("../lib/event_emitter").EventEmitter;
var BrowserFocus = require("../lib/browser_focus").BrowserFocus; var BrowserFocus = require("../lib/browser_focus").BrowserFocus;
var STATE_UNKNOWN = 0; var STATE_UNKNOWN = 0;
@ -117,7 +116,6 @@ function DefaultHandlers(editor) {
} }
var mousePageX = pageX, mousePageY = pageY; var mousePageX = pageX, mousePageY = pageY;
var overwrite = editor.getOverwrite();
var mousedownTime = (new Date()).getTime(); var mousedownTime = (new Date()).getTime();
var dragCursor, dragRange; var dragCursor, dragRange;
@ -186,7 +184,7 @@ function DefaultHandlers(editor) {
state = STATE_DRAG; state = STATE_DRAG;
dragRange = editor.getSelectionRange(); dragRange = editor.getSelectionRange();
var style = editor.getSelectionStyle(); var style = editor.getSelectionStyle();
dragSelectionMarker = editor.session.addMarker(dragRange, "ace_selection", style); editor.session.addMarker(dragRange, "ace_selection", style);
editor.clearSelection(); editor.clearSelection();
dom.addCssClass(editor.container, "ace_dragging"); dom.addCssClass(editor.container, "ace_dragging");
} }

1
lib/ace/mouse/mouse_event.js
View file

@ -39,7 +39,6 @@
define(function(require, exports, module) { define(function(require, exports, module) {
var event = require("../lib/event"); var event = require("../lib/event");
var dom = require("../lib/dom");
/** /**
* Custom Ace mouse event * Custom Ace mouse event

2
lib/ace/mouse/mouse_handler.js
View file

@ -86,7 +86,7 @@ var MouseHandler = function(editor) {
this.onMouseMove = function(e) { this.onMouseMove = function(e) {
// optimization, because mousemove doesn't have a default handler. // optimization, because mousemove doesn't have a default handler.
var listeners = this.editor._eventRegistry && this.editor._eventRegistry["mousemove"]; var listeners = this.editor._eventRegistry && this.editor._eventRegistry.mousemove;
if (!listeners || !listeners.length) if (!listeners || !listeners.length)
return; return;