code style
This commit is contained in:
parent
6917f7c672
commit
16ca8e1b02
14 changed files with 33 additions and 38 deletions
|
|
@ -34,6 +34,7 @@
|
||||||
.ace_gutter-cell {
|
.ace_gutter-cell {
|
||||||
padding-left: 19px;
|
padding-left: 19px;
|
||||||
padding-right: 6px;
|
padding-right: 6px;
|
||||||
|
background-repeat: no-repeat;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ace_gutter-cell.ace_error {
|
.ace_gutter-cell.ace_error {
|
||||||
|
|
@ -44,7 +45,6 @@
|
||||||
|
|
||||||
.ace_gutter-cell.ace_warning {
|
.ace_gutter-cell.ace_warning {
|
||||||
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUM2OEZDQTg4RTU0MTFFMUEzM0VFRTM2RUY1M0RBMjYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QUM2OEZDQTk4RTU0MTFFMUEzM0VFRTM2RUY1M0RBMjYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpBQzY4RkNBNjhFNTQxMUUxQTMzRUVFMzZFRjUzREEyNiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQzY4RkNBNzhFNTQxMUUxQTMzRUVFMzZFRjUzREEyNiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pgd7PfIAAAGmSURBVHjaYvr//z8DJZiJgUIANoCRkREb9gLiSVAaQx4OQM7AAkwd7XU2/v++/rOttdYGEB9dASEvOMydGKfH8Gv/p4XTkvRBfLxeQAP+1cUhXopyvzhP7P/IoSj7g7Mw09cNKO6J1QQ0L4gICPIv/veg/8W+JdFvQNLHVsW9/nmn9zk7B+cCkDwhL7gt6knSZnx9/LuCEOcvkIAMP+cvto9nfqyZmmUAksfnBUtbM60gX/3/kgyv3/xSFOL5DZT+L8vP+Yfh5cvfPvp/xUHyQHXGyAYwgpwBjZYFT3Y1OEl/OfCH4ffv3wzc4iwMvNIsDJ+f/mH4+vIPAxsb631WW0Yln6ZpQLXdMK/DXGDflh+sIv37EivD5x//Gb7+YWT4y86sl7BCCkSD+Z++/1dkvsFRl+HnD1Rvje4F8whjMXmGj58YGf5zsDMwcnAwfPvKcml62DsQDeaDxN+/Y0qwlpEHqrdB94IRNIDUgfgfKJChGK4OikEW3gTiXUB950ASLFAF54AC94A0G9QAfOnmF9DCDzABFqS08IHYDIScdijOjQABBgC+/9awBH96jwAAAABJRU5ErkJggg==");
|
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUM2OEZDQTg4RTU0MTFFMUEzM0VFRTM2RUY1M0RBMjYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QUM2OEZDQTk4RTU0MTFFMUEzM0VFRTM2RUY1M0RBMjYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpBQzY4RkNBNjhFNTQxMUUxQTMzRUVFMzZFRjUzREEyNiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQzY4RkNBNzhFNTQxMUUxQTMzRUVFMzZFRjUzREEyNiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pgd7PfIAAAGmSURBVHjaYvr//z8DJZiJgUIANoCRkREb9gLiSVAaQx4OQM7AAkwd7XU2/v++/rOttdYGEB9dASEvOMydGKfH8Gv/p4XTkvRBfLxeQAP+1cUhXopyvzhP7P/IoSj7g7Mw09cNKO6J1QQ0L4gICPIv/veg/8W+JdFvQNLHVsW9/nmn9zk7B+cCkDwhL7gt6knSZnx9/LuCEOcvkIAMP+cvto9nfqyZmmUAksfnBUtbM60gX/3/kgyv3/xSFOL5DZT+L8vP+Yfh5cvfPvp/xUHyQHXGyAYwgpwBjZYFT3Y1OEl/OfCH4ffv3wzc4iwMvNIsDJ+f/mH4+vIPAxsb631WW0Yln6ZpQLXdMK/DXGDflh+sIv37EivD5x//Gb7+YWT4y86sl7BCCkSD+Z++/1dkvsFRl+HnD1Rvje4F8whjMXmGj58YGf5zsDMwcnAwfPvKcml62DsQDeaDxN+/Y0qwlpEHqrdB94IRNIDUgfgfKJChGK4OikEW3gTiXUB950ASLFAF54AC94A0G9QAfOnmF9DCDzABFqS08IHYDIScdijOjQABBgC+/9awBH96jwAAAABJRU5ErkJggg==");
|
||||||
background-repeat: no-repeat;
|
|
||||||
background-position: 2px center;
|
background-position: 2px center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1061,7 +1061,7 @@ var EditSession = function(text, mode) {
|
||||||
if (i > foldStart) {
|
if (i > foldStart) {
|
||||||
i = foldLine.end.row + 1;
|
i = foldLine.end.row + 1;
|
||||||
if (i >= len)
|
if (i >= len)
|
||||||
break
|
break;
|
||||||
foldLine = this.$foldData[foldIndex++];
|
foldLine = this.$foldData[foldIndex++];
|
||||||
foldStart = foldLine ? foldLine.start.row : Infinity;
|
foldStart = foldLine ? foldLine.start.row : Infinity;
|
||||||
}
|
}
|
||||||
|
|
@ -1478,7 +1478,7 @@ var EditSession = function(text, mode) {
|
||||||
this.$clipRangeToDocument = function(range) {
|
this.$clipRangeToDocument = function(range) {
|
||||||
if (range.start.row < 0) {
|
if (range.start.row < 0) {
|
||||||
range.start.row = 0;
|
range.start.row = 0;
|
||||||
range.start.column = 0
|
range.start.column = 0;
|
||||||
} else {
|
} else {
|
||||||
range.start.column = this.$clipColumnToRow(
|
range.start.column = this.$clipColumnToRow(
|
||||||
range.start.row,
|
range.start.row,
|
||||||
|
|
@ -1576,7 +1576,7 @@ var EditSession = function(text, mode) {
|
||||||
this.$modified = true;
|
this.$modified = true;
|
||||||
if (this.$useWrapMode) {
|
if (this.$useWrapMode) {
|
||||||
this.$updateWrapData(0, this.getLength() - 1);
|
this.$updateWrapData(0, this.getLength() - 1);
|
||||||
this.$resetRowCache(0)
|
this.$resetRowCache(0);
|
||||||
this._emit("changeWrapLimit");
|
this._emit("changeWrapLimit");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -1943,7 +1943,7 @@ var EditSession = function(text, mode) {
|
||||||
addSplit(split);
|
addSplit(split);
|
||||||
}
|
}
|
||||||
return splits;
|
return splits;
|
||||||
}
|
};
|
||||||
|
|
||||||
/** internal, hide
|
/** internal, hide
|
||||||
* EditSession.$getDisplayTokens(str, offset) -> Array
|
* EditSession.$getDisplayTokens(str, offset) -> Array
|
||||||
|
|
@ -1981,7 +1981,7 @@ var EditSession = function(text, mode) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return arr;
|
return arr;
|
||||||
}
|
};
|
||||||
|
|
||||||
/** internal, hide
|
/** internal, hide
|
||||||
* EditSession.$getStringScreenWidth(str, maxScreenColumn, screenColumn) -> [Number]
|
* EditSession.$getStringScreenWidth(str, maxScreenColumn, screenColumn) -> [Number]
|
||||||
|
|
@ -2017,12 +2017,12 @@ var EditSession = function(text, mode) {
|
||||||
screenColumn += 1;
|
screenColumn += 1;
|
||||||
}
|
}
|
||||||
if (screenColumn > maxScreenColumn) {
|
if (screenColumn > maxScreenColumn) {
|
||||||
break
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return [screenColumn, column];
|
return [screenColumn, column];
|
||||||
}
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EditSession.getRowLength(row) -> Number
|
* EditSession.getRowLength(row) -> Number
|
||||||
|
|
@ -2037,7 +2037,7 @@ var EditSession = function(text, mode) {
|
||||||
} else {
|
} else {
|
||||||
return this.$wrapData[row].length + 1;
|
return this.$wrapData[row].length + 1;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EditSession.getRowHeight(config, row) -> Number
|
* EditSession.getRowHeight(config, row) -> Number
|
||||||
|
|
@ -2049,7 +2049,7 @@ var EditSession = function(text, mode) {
|
||||||
**/
|
**/
|
||||||
this.getRowHeight = function(config, row) {
|
this.getRowHeight = function(config, row) {
|
||||||
return this.getRowLength(row) * config.lineHeight;
|
return this.getRowLength(row) * config.lineHeight;
|
||||||
}
|
};
|
||||||
|
|
||||||
/** internal, hide, related to: EditSession.documentToScreenColumn
|
/** internal, hide, related to: EditSession.documentToScreenColumn
|
||||||
* EditSession.getScreenLastRowColumn(screenRow) -> Number
|
* EditSession.getScreenLastRowColumn(screenRow) -> Number
|
||||||
|
|
@ -2058,7 +2058,7 @@ var EditSession = function(text, mode) {
|
||||||
* Returns the column position (on screen) for the last character in the provided row.
|
* Returns the column position (on screen) for the last character in the provided row.
|
||||||
**/
|
**/
|
||||||
this.getScreenLastRowColumn = function(screenRow) {
|
this.getScreenLastRowColumn = function(screenRow) {
|
||||||
var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE)
|
var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE);
|
||||||
return this.documentToScreenColumn(pos.row, pos.column);
|
return this.documentToScreenColumn(pos.row, pos.column);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -2145,8 +2145,6 @@ var EditSession = function(text, mode) {
|
||||||
|
|
||||||
var rowCache = this.$screenRowCache;
|
var rowCache = this.$screenRowCache;
|
||||||
var i = this.$getRowCacheIndex(rowCache, screenRow);
|
var i = this.$getRowCacheIndex(rowCache, screenRow);
|
||||||
var row1 = rowCache[i];
|
|
||||||
var docRow1 = this.$docRowCache[i];
|
|
||||||
if (0 < i && i < rowCache.length) {
|
if (0 < i && i < rowCache.length) {
|
||||||
var row = rowCache[i];
|
var row = rowCache[i];
|
||||||
var docRow = this.$docRowCache[i];
|
var docRow = this.$docRowCache[i];
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@ function BracketMatch() {
|
||||||
if (!token)
|
if (!token)
|
||||||
token = iterator.stepForward();
|
token = iterator.stepForward();
|
||||||
if (!token)
|
if (!token)
|
||||||
return
|
return;
|
||||||
|
|
||||||
if (!typeRe){
|
if (!typeRe){
|
||||||
typeRe = new RegExp(
|
typeRe = new RegExp(
|
||||||
|
|
@ -200,7 +200,7 @@ function BracketMatch() {
|
||||||
if (!token)
|
if (!token)
|
||||||
token = iterator.stepForward();
|
token = iterator.stepForward();
|
||||||
if (!token)
|
if (!token)
|
||||||
return
|
return;
|
||||||
|
|
||||||
if (!typeRe){
|
if (!typeRe){
|
||||||
typeRe = new RegExp(
|
typeRe = new RegExp(
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ var Fold = exports.Fold = function(range, placeholder) {
|
||||||
var afterStart = this.subFolds[i];
|
var afterStart = this.subFolds[i];
|
||||||
|
|
||||||
if (cmp == 0)
|
if (cmp == 0)
|
||||||
return afterStart.addSubFold(fold)
|
return afterStart.addSubFold(fold);
|
||||||
|
|
||||||
// cmp == -1
|
// cmp == -1
|
||||||
var row = fold.range.end.row, column = fold.range.end.column;
|
var row = fold.range.end.row, column = fold.range.end.column;
|
||||||
|
|
@ -105,11 +105,11 @@ var Fold = exports.Fold = function(range, placeholder) {
|
||||||
if (cmp == 0)
|
if (cmp == 0)
|
||||||
throw "A fold can't intersect already existing fold" + fold.range + this.range;
|
throw "A fold can't intersect already existing fold" + fold.range + this.range;
|
||||||
|
|
||||||
var consumedFolds = this.subFolds.splice(i, j - i, fold)
|
var consumedFolds = this.subFolds.splice(i, j - i, fold);
|
||||||
fold.setFoldLine(this.foldLine);
|
fold.setFoldLine(this.foldLine);
|
||||||
|
|
||||||
return fold;
|
return fold;
|
||||||
}
|
};
|
||||||
|
|
||||||
}).call(Fold.prototype);
|
}).call(Fold.prototype);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -470,9 +470,7 @@ function Folding() {
|
||||||
|
|
||||||
this.getRowFoldEnd = function(docRow, startFoldRow) {
|
this.getRowFoldEnd = function(docRow, startFoldRow) {
|
||||||
var foldLine = this.getFoldLine(docRow, startFoldRow);
|
var foldLine = this.getFoldLine(docRow, startFoldRow);
|
||||||
return (foldLine
|
return foldLine ? foldLine.end.row : docRow;
|
||||||
? foldLine.end.row
|
|
||||||
: docRow);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.getFoldDisplayLine = function(foldLine, endRow, endColumn, startRow, startColumn) {
|
this.getFoldDisplayLine = function(foldLine, endRow, endColumn, startRow, startColumn) {
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ StateHandler.prototype = {
|
||||||
};
|
};
|
||||||
|
|
||||||
if (e) {
|
if (e) {
|
||||||
bufferObj.keyIdentifier = e.keyIdentifier
|
bufferObj.keyIdentifier = e.keyIdentifier;
|
||||||
}
|
}
|
||||||
|
|
||||||
return bufferObj;
|
return bufferObj;
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ var startCommands = {
|
||||||
},
|
},
|
||||||
"ctrl-b": {
|
"ctrl-b": {
|
||||||
command: "gotopageup"
|
command: "gotopageup"
|
||||||
},
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.handler = {
|
exports.handler = {
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,7 @@ EventEmitter.addEventListener = function(eventName, callback) {
|
||||||
|
|
||||||
var listeners = this._eventRegistry[eventName];
|
var listeners = this._eventRegistry[eventName];
|
||||||
if (!listeners)
|
if (!listeners)
|
||||||
var listeners = this._eventRegistry[eventName] = [];
|
listeners = this._eventRegistry[eventName] = [];
|
||||||
|
|
||||||
if (listeners.indexOf(callback) == -1)
|
if (listeners.indexOf(callback) == -1)
|
||||||
listeners.push(callback);
|
listeners.push(callback);
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ define(function(require, exports, module) {
|
||||||
(regex.multiline ? "m" : "") +
|
(regex.multiline ? "m" : "") +
|
||||||
(regex.extended ? "x" : "") + // Proposed for ES4; included in AS3
|
(regex.extended ? "x" : "") + // Proposed for ES4; included in AS3
|
||||||
(regex.sticky ? "y" : "");
|
(regex.sticky ? "y" : "");
|
||||||
};
|
}
|
||||||
|
|
||||||
function indexOf (array, item, from) {
|
function indexOf (array, item, from) {
|
||||||
if (Array.prototype.indexOf) // Use the native array method if available
|
if (Array.prototype.indexOf) // Use the native array method if available
|
||||||
|
|
@ -108,6 +108,6 @@ define(function(require, exports, module) {
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
};
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ define(function(require, exports, module) {
|
||||||
var Tokenizer = require("../tokenizer").Tokenizer;
|
var Tokenizer = require("../tokenizer").Tokenizer;
|
||||||
var Rules = require("./coffee_highlight_rules").CoffeeHighlightRules;
|
var Rules = require("./coffee_highlight_rules").CoffeeHighlightRules;
|
||||||
var Outdent = require("./matching_brace_outdent").MatchingBraceOutdent;
|
var Outdent = require("./matching_brace_outdent").MatchingBraceOutdent;
|
||||||
var PythonFoldMode = require("./folding/coffee").FoldMode;
|
var FoldMode = require("./folding/coffee").FoldMode;
|
||||||
var Range = require("../range").Range;
|
var Range = require("../range").Range;
|
||||||
var TextMode = require("./text").Mode;
|
var TextMode = require("./text").Mode;
|
||||||
var WorkerClient = require("../worker/worker_client").WorkerClient;
|
var WorkerClient = require("../worker/worker_client").WorkerClient;
|
||||||
|
|
@ -50,7 +50,7 @@ var oop = require("../lib/oop");
|
||||||
function Mode() {
|
function Mode() {
|
||||||
this.$tokenizer = new Tokenizer(new Rules().getRules());
|
this.$tokenizer = new Tokenizer(new Rules().getRules());
|
||||||
this.$outdent = new Outdent();
|
this.$outdent = new Outdent();
|
||||||
this.foldingRules = new PythonFoldMode("=|=>|->|\\s*class [^#]*");
|
this.foldingRules = new FoldMode();
|
||||||
}
|
}
|
||||||
|
|
||||||
oop.inherits(Mode, TextMode);
|
oop.inherits(Mode, TextMode);
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ oop.inherits(FoldMode, BaseFoldMode);
|
||||||
if (session.getLine(row - 2).search(/\S/) == -1) {
|
if (session.getLine(row - 2).search(/\S/) == -1) {
|
||||||
session.foldWidgets[row - 1] = "start";
|
session.foldWidgets[row - 1] = "start";
|
||||||
session.foldWidgets[row + 1] = "";
|
session.foldWidgets[row + 1] = "";
|
||||||
return ""
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,10 +64,10 @@ oop.inherits(FoldMode, BaseFoldMode);
|
||||||
for (var l = session.getLength(); ++row < l; ) {
|
for (var l = session.getLength(); ++row < l; ) {
|
||||||
line = session.getLine(row);
|
line = session.getLine(row);
|
||||||
if (re.test(line))
|
if (re.test(line))
|
||||||
break
|
break;
|
||||||
}
|
}
|
||||||
if (row == start.row + 1)
|
if (row == start.row + 1)
|
||||||
return;
|
return;
|
||||||
return Range.fromPoints(start, {row: row - 1, column: line.length});
|
return Range.fromPoints(start, {row: row - 1, column: line.length});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,6 @@ function DefaultHandlers(mouseHandler) {
|
||||||
var pos = ev.getDocumentPosition();
|
var pos = ev.getDocumentPosition();
|
||||||
this.mousedownEvent = ev;
|
this.mousedownEvent = ev;
|
||||||
var editor = this.editor;
|
var editor = this.editor;
|
||||||
var _self = this;
|
|
||||||
|
|
||||||
var button = ev.getButton();
|
var button = ev.getButton();
|
||||||
if (button !== 0) {
|
if (button !== 0) {
|
||||||
|
|
@ -127,7 +126,7 @@ function DefaultHandlers(mouseHandler) {
|
||||||
this.editor.selection.clearSelection();
|
this.editor.selection.clearSelection();
|
||||||
}
|
}
|
||||||
this.setState("select");
|
this.setState("select");
|
||||||
}
|
};
|
||||||
|
|
||||||
this.select = function() {
|
this.select = function() {
|
||||||
var anchor, editor = this.editor;
|
var anchor, editor = this.editor;
|
||||||
|
|
@ -201,7 +200,7 @@ function DefaultHandlers(mouseHandler) {
|
||||||
command: {
|
command: {
|
||||||
exec: function(editor) {
|
exec: function(editor) {
|
||||||
var self = editor.$mouseHandler;
|
var self = editor.$mouseHandler;
|
||||||
self.dragCursor = null
|
self.dragCursor = null;
|
||||||
self.dragEnd();
|
self.dragEnd();
|
||||||
self.startSelect();
|
self.startSelect();
|
||||||
}
|
}
|
||||||
|
|
@ -276,7 +275,7 @@ function DefaultHandlers(mouseHandler) {
|
||||||
this.onDoubleClick = function(ev) {
|
this.onDoubleClick = function(ev) {
|
||||||
var pos = ev.getDocumentPosition();
|
var pos = ev.getDocumentPosition();
|
||||||
var editor = this.editor;
|
var editor = this.editor;
|
||||||
var session = editor.session
|
var session = editor.session;
|
||||||
|
|
||||||
var range = session.getBracketRange(pos);
|
var range = session.getBracketRange(pos);
|
||||||
if (range) {
|
if (range) {
|
||||||
|
|
|
||||||
4
lib/ace/mouse/dragdrop.js
vendored
4
lib/ace/mouse/dragdrop.js
vendored
|
|
@ -47,7 +47,7 @@ var DragdropHandler = function(mouseHandler) {
|
||||||
var dragCursor, counter = 0;
|
var dragCursor, counter = 0;
|
||||||
|
|
||||||
var mouseTarget = editor.container;
|
var mouseTarget = editor.container;
|
||||||
event.addListener(mouseTarget, "dragenter", function(e) {console.log(e.type, counter,e.target);
|
event.addListener(mouseTarget, "dragenter", function(e) {
|
||||||
counter++;
|
counter++;
|
||||||
if (!dragSelectionMarker) {
|
if (!dragSelectionMarker) {
|
||||||
range = editor.getSelectionRange();
|
range = editor.getSelectionRange();
|
||||||
|
|
@ -73,7 +73,7 @@ var DragdropHandler = function(mouseHandler) {
|
||||||
editor.renderer.scrollCursorIntoView();
|
editor.renderer.scrollCursorIntoView();
|
||||||
};
|
};
|
||||||
|
|
||||||
event.addListener(mouseTarget, "dragleave", function(e) {console.log(e.type, counter,e.target);
|
event.addListener(mouseTarget, "dragleave", function(e) {
|
||||||
counter--;
|
counter--;
|
||||||
if (counter > 0)
|
if (counter > 0)
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue