"
- );
- }
+ lineEl = this.$createLineElement();
+ parent.appendChild(lineEl);
- stringBuilder.push(lang.stringRepeat("\xa0", splits.indent));
+ lineEl.appendChild(this.dom.createTextNode(lang.stringRepeat("\xa0", splits.indent), this.element));
split ++;
screenColumn = 0;
@@ -431,40 +476,45 @@ var Text = function(parentEl) {
if (value.length != 0) {
chars += value.length;
screenColumn = this.$renderToken(
- stringBuilder, screenColumn, token, value
+ lineEl, screenColumn, token, value
);
}
}
}
};
- this.$renderSimpleLine = function(stringBuilder, tokens) {
+ this.$renderSimpleLine = function(parent, tokens) {
var screenColumn = 0;
var token = tokens[0];
var value = token.value;
if (this.displayIndentGuides)
- value = this.renderIndentGuide(stringBuilder, value);
+ value = this.renderIndentGuide(parent, value);
if (value)
- screenColumn = this.$renderToken(stringBuilder, screenColumn, token, value);
+ screenColumn = this.$renderToken(parent, screenColumn, token, value);
for (var i = 1; i < tokens.length; i++) {
token = tokens[i];
value = token.value;
if (screenColumn + value.length > this.MAX_LINE_LENGTH)
- return this.$renderOverflowMessage(stringBuilder, screenColumn, token, value);
- screenColumn = this.$renderToken(stringBuilder, screenColumn, token, value);
+ return this.$renderOverflowMessage(parent, screenColumn, token, value);
+ screenColumn = this.$renderToken(parent, screenColumn, token, value);
}
};
- this.$renderOverflowMessage = function(stringBuilder, screenColumn, token, value) {
- this.$renderToken(stringBuilder, screenColumn, token,
+ this.$renderOverflowMessage = function(parent, screenColumn, token, value) {
+ this.$renderToken(parent, screenColumn, token,
value.slice(0, this.MAX_LINE_LENGTH - screenColumn));
- stringBuilder.push(
- "
<click to see more...>"
- );
+
+ var overflowEl = this.dom.createElement("span");
+ overflowEl.className = "ace_inline_button ace_keyword ace_toggle_wrap";
+ overflowEl.style.position = "absolute";
+ overflowEl.style.right = "0";
+ overflowEl.textContent = "
";
+
+ parent.appendChild(overflowEl);
};
// row is either first row of foldline or not in fold
- this.$renderLine = function(stringBuilder, row, onlyContents, foldLine) {
+ this.$renderLine = function(parent, row, foldLine) {
if (!foldLine && foldLine != false)
foldLine = this.session.getFoldLine(row);
@@ -473,36 +523,35 @@ var Text = function(parentEl) {
else
var tokens = this.session.getTokens(row);
-
- if (!onlyContents) {
- stringBuilder.push(
- ""
- );
- }
-
+ var lastLineEl = parent;
if (tokens.length) {
var splits = this.session.getRowSplitData(row);
- if (splits && splits.length)
- this.$renderWrappedLine(stringBuilder, tokens, splits, onlyContents);
- else
- this.$renderSimpleLine(stringBuilder, tokens);
+ if (splits && splits.length) {
+ this.$renderWrappedLine(parent, tokens, splits);
+ var lastLineEl = parent.lastChild;
+ } else {
+ var lastLineEl = parent;
+ if (this.$useLineGroups()) {
+ lastLineEl = this.$createLineElement();
+ parent.appendChild(lastLineEl);
+ }
+ this.$renderSimpleLine(lastLineEl, tokens);
+ }
+ } else if (this.$useLineGroups()) {
+ lastLineEl = this.$createLineElement();
+ parent.appendChild(lastLineEl);
}
- if (this.showInvisibles) {
+ if (this.showInvisibles && lastLineEl) {
if (foldLine)
row = foldLine.end.row;
- stringBuilder.push(
- "",
- row == this.session.getLength() - 1 ? this.EOF_CHAR : this.EOL_CHAR,
- ""
- );
+ var invisibleEl = this.dom.createElement("span");
+ invisibleEl.className = "ace_invisible ace_invisible_eol";
+ invisibleEl.textContent = row == this.session.getLength() - 1 ? this.EOF_CHAR : this.EOL_CHAR;
+
+ lastLineEl.appendChild(invisibleEl);
}
- if (!onlyContents)
- stringBuilder.push("
");
};
this.$getFoldLineTokens = function(row, foldLine) {
diff --git a/plugins/node_modules/ace/lib/ace/layer/text_test.js b/plugins/node_modules/ace/lib/ace/layer/text_test.js
index b7dbcc0e..aa944821 100644
--- a/plugins/node_modules/ace/lib/ace/layer/text_test.js
+++ b/plugins/node_modules/ace/lib/ace/layer/text_test.js
@@ -40,6 +40,7 @@ var assert = require("../test/assertions");
var EditSession = require("../edit_session").EditSession;
var TextLayer = require("./text").Text;
var JavaScriptMode = require("../mode/javascript").Mode;
+var dom = require("../lib/dom");
module.exports = {
@@ -60,61 +61,63 @@ module.exports = {
this.textLayer.$computeTabString();
// row with hard tabs
- var stringBuilder = [];
- this.textLayer.$renderLine(stringBuilder, 0);
+ var parent1 = dom.createElement("div");
+ this.textLayer.$renderLine(parent1, 0);
// row with soft tabs
- var stringBuilder2 = [];
- this.textLayer.$renderLine(stringBuilder2, 1);
- assert.equal(stringBuilder.join(""), stringBuilder2.join(""));
+ var parent2 = dom.createElement("div");
+ this.textLayer.$renderLine(parent2, 1);
+ assert.equal(parent1.innerHTML, parent2.innerHTML);
},
"test rendering width of ideographic space (U+3000)" : function() {
this.session.setValue("\u3000");
- var stringBuilder = [];
- this.textLayer.$renderLine(stringBuilder, 0, true);
- assert.equal(stringBuilder.join(""), "");
+ var parent = dom.createElement("div");
+ this.textLayer.$renderLine(parent, 0);
+ assert.domNode(parent, ["div", {}, ["span", {class: "ace_cjk", style: "width: 20px;"}]]);
this.textLayer.setShowInvisibles(true);
- var stringBuilder = [];
- this.textLayer.$renderLine(stringBuilder, 0, true);
- assert.equal(
- stringBuilder.join(""),
- "" + this.textLayer.SPACE_CHAR + ""
- + "\xB6"
- );
+ var parent = dom.createElement("div");
+ this.textLayer.$renderLine(parent, 0);
+ assert.domNode(parent, ["div", {},
+ ["span", {class: "ace_cjk ace_invisible ace_invisible_space", style: "width: 20px;"}, this.textLayer.SPACE_CHAR],
+ ["span", {class: "ace_invisible ace_invisible_eol"}, "\xB6"]
+ ]);
},
"test rendering of indent guides" : function() {
var textLayer = this.textLayer;
- var EOL = "" + textLayer.EOL_CHAR + "";
+ var EOL = "" + textLayer.EOL_CHAR + "";
var SPACE = function(i) {return Array(i+1).join(" ");};
var DOT = function(i) {return Array(i+1).join(textLayer.SPACE_CHAR);};
var TAB = function(i) {return Array(i+1).join(textLayer.TAB_CHAR);};
function testRender(results) {
for (var i = results.length; i--; ) {
- var stringBuilder = [];
- textLayer.$renderLine(stringBuilder, i, true);
- assert.equal(stringBuilder.join(""), results[i]);
+ var parent = dom.createElement("div");
+ textLayer.$renderLine(parent, i);
+
+ assert.equal(parent.innerHTML, results[i]);
}
}
this.session.setValue(" \n\t\tf\n ");
testRender([
- "" + SPACE(4) + "" + SPACE(2),
- "" + SPACE(4) + "" + SPACE(4) + "f",
+ "" + SPACE(4) + "" + SPACE(2),
+ "" + SPACE(4) + "" + SPACE(4) + "f",
SPACE(3)
]);
+
this.textLayer.setShowInvisibles(true);
testRender([
- "" + DOT(4) + "" + DOT(2) + "" + EOL,
- "" + TAB(4) + "" + TAB(4) + "f" + EOL
+ "" + DOT(4) + "" + DOT(2) + "" + EOL,
+ "" + TAB(4) + "" + TAB(4) + "f" + EOL
]);
+
this.textLayer.setDisplayIndentGuides(false);
testRender([
- "" + DOT(6) + "" + EOL,
- "" + TAB(4) + "" + TAB(4) + "f" + EOL
+ "" + DOT(6) + "" + EOL,
+ "" + TAB(4) + "" + TAB(4) + "f" + EOL
]);
}
};
diff --git a/plugins/node_modules/ace/lib/ace/lib/dom.js b/plugins/node_modules/ace/lib/ace/lib/dom.js
index ae3513ce..ccfda22c 100644
--- a/plugins/node_modules/ace/lib/ace/lib/dom.js
+++ b/plugins/node_modules/ace/lib/ace/lib/dom.js
@@ -31,6 +31,7 @@
define(function(require, exports, module) {
"use strict";
+var useragent = require("./useragent");
var XHTML_NS = "http://www.w3.org/1999/xhtml";
exports.buildDom = function buildDom(arr, parent, refs) {
@@ -90,6 +91,20 @@ exports.createElement = function(tag, ns) {
document.createElement(tag);
};
+exports.removeChildren = function(element) {
+ element.innerHTML = "";
+};
+
+exports.createTextNode = function(textContent, element) {
+ var doc = element ? element.ownerDocument : document;
+ return doc.createTextNode(textContent);
+};
+
+exports.createFragment = function(element) {
+ var doc = element ? element.ownerDocument : document;
+ return doc.createDocumentFragment();
+};
+
exports.hasCssClass = function(el, name) {
var classes = (el.className + "").split(/\s+/g);
return classes.indexOf(name) !== -1;
@@ -183,6 +198,9 @@ exports.importCssString = function importCssString(cssText, id, container) {
root.appendChild(style);
};
+exports.importCssStylsheet = function(uri, doc) {
+ exports.buildDom(["link", {rel: "stylesheet", href: uri}], exports.getDocumentHead(doc));
+};
exports.scrollbarWidth = function(document) {
var inner = exports.createElement("ace_inner");
inner.style.width = "100%";
@@ -228,4 +246,44 @@ exports.computedStyle = function(element, style) {
return window.getComputedStyle(element, "") || {};
};
+exports.setStyle = function(styles, property, value) {
+ if (styles[property] !== value) {
+ //console.log("set style", property, styles[property], value);
+ styles[property] = value;
+ }
+};
+
+exports.HAS_CSS_ANIMATION = false;
+if (typeof document !== "undefined") {
+ var div = document.createElement("div");
+ if (typeof div.style.animationName !== "undefined") {
+ exports.HAS_CSS_ANIMATION = true;
+ }
+}
+
+exports.HAS_CSS_TRANSFORMS = false;
+exports.HI_DPI = useragent.isWin
+ ? typeof window !== "undefined" && window.devicePixelRatio >= 1.5
+ : true;
+
+if (exports.HI_DPI && typeof document !== "undefined") {
+ // detect CSS transformation support
+ var div = document.createElement("div");
+ if (div.style.transform !== undefined)
+ exports.HAS_CSS_TRANSFORMS = true;
+ div = null;
+
+}
+
+if (exports.HAS_CSS_TRANSFORMS) {
+ exports.translate = function(element, tx, ty) {
+ element.style.transform = "translate(" + Math.round(tx) + "px, " + Math.round(ty) +"px)";
+ };
+} else {
+ exports.translate = function(element, tx, ty) {
+ element.style.top = Math.round(ty) + "px";
+ element.style.left = Math.round(tx) + "px";
+ };
+}
+
});
diff --git a/plugins/node_modules/ace/lib/ace/lib/event.js b/plugins/node_modules/ace/lib/ace/lib/event.js
index fbbf7f7c..2b2d52f5 100644
--- a/plugins/node_modules/ace/lib/ace/lib/event.js
+++ b/plugins/node_modules/ace/lib/ace/lib/event.js
@@ -364,7 +364,6 @@ exports.addCommandKeyListener = function(el, callback) {
}
};
function resetPressedKeys() {
- // console.log("resetting")
pressedKeys = Object.create(null);
}
@@ -372,18 +371,42 @@ if (typeof window == "object" && window.postMessage && !useragent.isOldIE) {
var postMessageId = 1;
exports.nextTick = function(callback, win) {
win = win || window;
- var messageName = "zero-timeout-message-" + postMessageId;
- exports.addListener(win, "message", function listener(e) {
+ var messageName = "zero-timeout-message-" + (postMessageId++);
+
+ var listener = function(e) {
if (e.data == messageName) {
exports.stopPropagation(e);
exports.removeListener(win, "message", listener);
callback();
}
- });
+ };
+
+ exports.addListener(win, "message", listener);
win.postMessage(messageName, "*");
};
}
+exports.$idleBlocked = false;
+exports.onIdle = function(cb, timeout) {
+ return setTimeout(function handler() {
+ if (!exports.$idleBlocked) {
+ cb();
+ } else {
+ setTimeout(handler, 100);
+ }
+ }, timeout);
+};
+
+exports.$idleBlockId = null;
+exports.blockIdle = function(delay) {
+ if (exports.$idleBlockId)
+ clearTimeout(exports.$idleBlockId);
+
+ exports.$idleBlocked = true;
+ exports.$idleBlockId = setTimeout(function() {
+ exports.$idleBlocked = false;
+ }, delay || 100);
+};
exports.nextFrame = typeof window == "object" && (window.requestAnimationFrame
|| window.mozRequestAnimationFrame
diff --git a/plugins/node_modules/ace/lib/ace/lib/event_emitter.js b/plugins/node_modules/ace/lib/ace/lib/event_emitter.js
index 4412e2be..6d5c2f0e 100644
--- a/plugins/node_modules/ace/lib/ace/lib/event_emitter.js
+++ b/plugins/node_modules/ace/lib/ace/lib/event_emitter.js
@@ -109,7 +109,6 @@ EventEmitter.removeDefaultHandler = function(eventName, callback) {
var disabled = handlers._disabled_[eventName];
if (handlers[eventName] == callback) {
- var old = handlers[eventName];
if (disabled)
this.setDefaultHandler(eventName, disabled.pop());
} else if (disabled) {
diff --git a/plugins/node_modules/ace/lib/ace/lib/keys.js b/plugins/node_modules/ace/lib/ace/lib/keys.js
index cca7ff24..5e72b779 100644
--- a/plugins/node_modules/ace/lib/ace/lib/keys.js
+++ b/plugins/node_modules/ace/lib/ace/lib/keys.js
@@ -34,8 +34,6 @@ For more information about SproutCore, visit http://www.sproutcore.com
define(function(require, exports, module) {
"use strict";
-require("./fixoldbrowsers");
-
var oop = require("./oop");
/*
diff --git a/plugins/node_modules/ace/lib/ace/mode/java_highlight_rules.js b/plugins/node_modules/ace/lib/ace/mode/java_highlight_rules.js
index add43eef..0f28b717 100644
--- a/plugins/node_modules/ace/lib/ace/mode/java_highlight_rules.js
+++ b/plugins/node_modules/ace/lib/ace/mode/java_highlight_rules.js
@@ -88,6 +88,37 @@ var JavaHighlightRules = function() {
}, {
token : "constant.language.boolean",
regex : "(?:true|false)\\b"
+ }, {
+ regex: "(open(?:\\s+))?module(?=\\s*\\w)",
+ token: "keyword",
+ next: [{
+ regex: "{",
+ token: "paren.lparen",
+ next: [{
+ regex: "}",
+ token: "paren.rparen",
+ next: "start"
+ }, {
+ // From Section 3.9 of http://cr.openjdk.java.net/~mr/jigsaw/spec/java-se-9-jls-diffs.pdf
+ regex: "\\b(requires|transitive|exports|opens|to|uses|provides|with)\\b",
+ token: "keyword"
+ }]
+ }, {
+ token : "text",
+ regex : "\\s+"
+ }, {
+ token : "identifier",
+ regex : "\\w+"
+ }, {
+ token : "punctuation.operator",
+ regex : "."
+ }, {
+ token : "text",
+ regex : "\\s+"
+ }, {
+ regex: "", // exit if there is anything else
+ next: "start"
+ }]
}, {
token : keywordMapper,
// TODO: Unicode escape sequences
@@ -118,8 +149,10 @@ var JavaHighlightRules = function() {
]
};
+
this.embedRules(DocCommentHighlightRules, "doc-",
[ DocCommentHighlightRules.getEndRule("start") ]);
+ this.normalizeRules();
};
oop.inherits(JavaHighlightRules, TextHighlightRules);
diff --git a/plugins/node_modules/ace/lib/ace/mode/php_highlight_rules.js b/plugins/node_modules/ace/lib/ace/mode/php_highlight_rules.js
index 7bb3e4c2..f79dea03 100644
--- a/plugins/node_modules/ace/lib/ace/mode/php_highlight_rules.js
+++ b/plugins/node_modules/ace/lib/ace/mode/php_highlight_rules.js
@@ -1002,6 +1002,9 @@ var PhpLangHighlightRules = function() {
}, {
token : "keyword.operator",
regex : "::|!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|!=|!==|<=|>=|=>|<<=|>>=|>>>=|<>|<|>|\\.=|=|!|&&|\\|\\||\\?\\:|\\*=|/=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+ }, {
+ token : "punctuation.operator",
+ regex : /[,;]/
}, {
token : "paren.lparen",
regex : "[[({]"
diff --git a/plugins/node_modules/ace/lib/ace/mouse/default_handlers.js b/plugins/node_modules/ace/lib/ace/mouse/default_handlers.js
index 140cbd50..046a8038 100644
--- a/plugins/node_modules/ace/lib/ace/mouse/default_handlers.js
+++ b/plugins/node_modules/ace/lib/ace/mouse/default_handlers.js
@@ -31,8 +31,6 @@
define(function(require, exports, module) {
"use strict";
-var dom = require("../lib/dom");
-var event = require("../lib/event");
var useragent = require("../lib/useragent");
var DRAG_OFFSET = 0; // pixels
diff --git a/plugins/node_modules/ace/lib/ace/mouse/mouse_handler.js b/plugins/node_modules/ace/lib/ace/mouse/mouse_handler.js
index a383ba32..439692b5 100644
--- a/plugins/node_modules/ace/lib/ace/mouse/mouse_handler.js
+++ b/plugins/node_modules/ace/lib/ace/mouse/mouse_handler.js
@@ -216,7 +216,7 @@ var MouseHandler = function(editor) {
config.defineOptions(MouseHandler.prototype, "mouseHandler", {
scrollSpeed: {initialValue: 2},
- dragDelay: {initialValue: 150},
+ dragDelay: {initialValue: (useragent.isMac ? 150 : 0)},
dragEnabled: {initialValue: true},
focusTimeout: {initialValue: 0},
tooltipFollowsMouse: {initialValue: true}
diff --git a/plugins/node_modules/ace/lib/ace/mouse/mouse_handler_test.js b/plugins/node_modules/ace/lib/ace/mouse/mouse_handler_test.js
index c35b09d5..fff48caf 100644
--- a/plugins/node_modules/ace/lib/ace/mouse/mouse_handler_test.js
+++ b/plugins/node_modules/ace/lib/ace/mouse/mouse_handler_test.js
@@ -36,8 +36,9 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) {
"use strict";
+require("../multi_select");
var Editor = require("../editor").Editor;
-var MockRenderer = require("../test/mockrenderer").MockRenderer;
+var VirtualRenderer = require("../virtual_renderer").VirtualRenderer;
var assert = require("../test/assertions");
var MouseEvent = function(type, opts){
var e = document.createEvent("MouseEvents");
@@ -53,20 +54,77 @@ var MouseEvent = function(type, opts){
module.exports = {
setUp : function(next) {
- this.editor = new Editor(new MockRenderer());
- this.editor.setValue("Juhu kinners!");
+ this.editor = new Editor(new VirtualRenderer());
+ this.editor.session.setValue("Juhu kinners!");
+ this.editor.container.style.position = "absolute";
+ this.editor.container.style.height = "500px";
+ this.editor.container.style.width = "500px";
+ this.editor.container.style.left = "50px";
+ this.editor.container.style.top = "10px";
+ document.body.appendChild(this.editor.container);
next();
},
"test: double tap. issue #956" : function() {
// mouse up fired immediately after mouse down
+ this.editor.resize(true);
+ var pos = this.editor.renderer.textToScreenCoordinates(0, 1);
var target = this.editor.renderer.getMouseEventTarget();
- target.dispatchEvent(MouseEvent("down", {x: 1, y: 1}));
- target.dispatchEvent(MouseEvent("up", {x: 1, y: 1}));
- target.dispatchEvent(MouseEvent("down", {x: 1, y: 1, detail: 2}));
- target.dispatchEvent(MouseEvent("up", {x: 1, y: 1, detail: 2}));
+ target.dispatchEvent(MouseEvent("down", {x: pos.pageX, y: pos.pageY}));
+ target.dispatchEvent(MouseEvent("up", {x: pos.pageX, y: pos.pageY}));
+ target.dispatchEvent(MouseEvent("down", {x: pos.pageX, y: pos.pageY, detail: 2}));
+ target.dispatchEvent(MouseEvent("up", {x: pos.pageX, y: pos.pageY, detail: 2}));
assert.equal(this.editor.getSelectedText(), "Juhu");
+
+ target.dispatchEvent(MouseEvent("down", {x: pos.pageX, y: pos.pageY}));
+ target.dispatchEvent(MouseEvent("up", {x: pos.pageX, y: pos.pageY}));
+ assert.equal(this.editor.getSelectedText(), "");
+ },
+ "test: multiselect" : function() {
+ var target = this.editor.renderer.getMouseEventTarget();
+ this.editor.session.setValue("xyz\n\nabc efg");
+ this.editor.resize(true);
+
+ var pos = this.editor.renderer.textToScreenCoordinates(0, 1);
+
+ target.dispatchEvent(MouseEvent("down", {x: pos.pageX, y: pos.pageY}));
+ target.dispatchEvent(MouseEvent("up", {x: pos.pageX, y: pos.pageY}));
+
+ pos = this.editor.renderer.textToScreenCoordinates(0, 2);
+
+ target.dispatchEvent(MouseEvent("down", {x: pos.pageX, y: pos.pageY, ctrl: true}));
+ target.dispatchEvent(MouseEvent("up", {x: pos.pageX, y: pos.pageY}));
+
+ var selection = "Range: [0/2] -> [0/2],Range: [0/1] -> [0/1]";
+ assert.equal(this.editor.selection.toJSON() + "", selection);
+
+ pos = this.editor.renderer.textToScreenCoordinates(2, 2);
+
+ target.dispatchEvent(MouseEvent("down", {x: pos.pageX, y: pos.pageY, detail: 2, ctrl: true}));
+ target.dispatchEvent(MouseEvent("up", {x: pos.pageX, y: pos.pageY, detail: 2, ctrl: true}));
+
+ selection = "Range: [2/0] -> [2/3]," + selection;
+ assert.equal(this.editor.selection.toJSON() + "", selection);
+
+ var pos = this.editor.renderer.textToScreenCoordinates(0, 1);
+
+ target.dispatchEvent(MouseEvent("down", {x: pos.pageX, y: pos.pageY, ctrl: true}));
+ target.dispatchEvent(MouseEvent("up", {x: pos.pageX, y: pos.pageY, ctrl: true}));
+ selection = selection.split(",").slice(0, -1).join(",");
+ assert.equal(this.editor.selection.toJSON() + "", selection);
+
+ var pos1 = this.editor.renderer.textToScreenCoordinates(0, 2);
+ var pos2 = this.editor.renderer.textToScreenCoordinates(2, 2);
+
+ target.dispatchEvent(MouseEvent("down", {x: pos1.pageX, y: pos1.pageY, alt: true}));
+ target.dispatchEvent(MouseEvent("move", {x: pos2.pageX, y: pos2.pageY + 1, alt: true}));
+ target.dispatchEvent(MouseEvent("up", {x: pos2.pageX, y: pos2.pageY + 1, alt: true}));
+ assert.equal(this.editor.selection.toJSON() + "", "Range: [2/2] -> [2/2],Range: [1/0] -> [1/0],Range: [0/2] -> [0/2]");
+ },
+
+ tearDown : function() {
+ document.body.removeChild(this.editor.container);
}
};
diff --git a/plugins/node_modules/ace/lib/ace/mouse/multi_select_handler.js b/plugins/node_modules/ace/lib/ace/mouse/multi_select_handler.js
index 5ec027ec..92ebc575 100644
--- a/plugins/node_modules/ace/lib/ace/mouse/multi_select_handler.js
+++ b/plugins/node_modules/ace/lib/ace/mouse/multi_select_handler.js
@@ -173,6 +173,7 @@ function onMouseDown(e) {
screenCursor = {row: -1, column: -1};
var onMouseSelectionEnd = function(e) {
+ blockSelect();
clearInterval(timerId);
editor.removeSelectionMarkers(rectSel);
if (!rectSel.length)
diff --git a/plugins/node_modules/ace/lib/ace/multi_select.js b/plugins/node_modules/ace/lib/ace/multi_select.js
index a98a0d0a..ea056814 100644
--- a/plugins/node_modules/ace/lib/ace/multi_select.js
+++ b/plugins/node_modules/ace/lib/ace/multi_select.js
@@ -560,6 +560,8 @@ var Editor = require("./editor").Editor;
if (pos.row != anchor.row
|| this.session.$clipPositionToDocument(pos.row, pos.column).column != anchor.column)
this.multiSelect.toSingleRange(this.multiSelect.toOrientedRange());
+ else
+ this.multiSelect.mergeOverlappingRanges();
}
};
diff --git a/plugins/node_modules/ace/lib/ace/multi_select_test.js b/plugins/node_modules/ace/lib/ace/multi_select_test.js
index b08e160c..75f69ab0 100644
--- a/plugins/node_modules/ace/lib/ace/multi_select_test.js
+++ b/plugins/node_modules/ace/lib/ace/multi_select_test.js
@@ -275,6 +275,31 @@ module.exports = {
doc.markUndoGroup();
editor.execCommand("undo");
assert.equal('l1\nl2\nl3', editor.getValue());
+ },
+
+ "test splitIntoLines": function() {
+ var session = new EditSession(["l1", "l2", "l3"]);
+ var selection = session.selection;
+ editor = new Editor(new MockRenderer(), session);
+
+ var nCursor = 0;
+ var nSelection = 0;
+ selection.on("changeCursor", function() { nCursor++; });
+ selection.on("changeSelection", function() { nSelection++; });
+
+ selection.moveTo(0, 0);
+ selection.selectDown();
+ selection.splitIntoLines();
+ assert.equal(nCursor, 2);
+ assert.equal(nSelection, 2);
+ nCursor = nSelection = 0;
+ selection.selectAll();
+ assert.equal(nCursor, 0);
+ assert.equal(nSelection, 1);
+
+ selection.splitIntoLines();
+ editor.setValue("");
+ assert.equal(editor.selection.inMultiSelectMode, false);
}
};
diff --git a/plugins/node_modules/ace/lib/ace/range_list.js b/plugins/node_modules/ace/lib/ace/range_list.js
index 149d6372..5b8f73ce 100644
--- a/plugins/node_modules/ace/lib/ace/range_list.js
+++ b/plugins/node_modules/ace/lib/ace/range_list.js
@@ -181,46 +181,89 @@ var RangeList = function() {
};
this.$onChange = function(delta) {
- if (delta.action == "insert"){
- var start = delta.start;
- var end = delta.end;
- } else {
- var end = delta.start;
- var start = delta.end;
- }
+ var start = delta.start;
+ var end = delta.end;
var startRow = start.row;
var endRow = end.row;
- var lineDif = endRow - startRow;
-
- var colDiff = -start.column + end.column;
var ranges = this.ranges;
-
for (var i = 0, n = ranges.length; i < n; i++) {
var r = ranges[i];
- if (r.end.row < startRow)
- continue;
- if (r.start.row > startRow)
+ if (r.end.row >= startRow)
break;
-
- if (r.start.row == startRow && r.start.column >= start.column ) {
- if (r.start.column == start.column && this.$insertRight) {
- // do nothing
- } else {
- r.start.column += colDiff;
- r.start.row += lineDif;
+ }
+
+ if (delta.action == "insert") {
+ var lineDif = endRow - startRow;
+ var colDiff = -start.column + end.column;
+ for (; i < n; i++) {
+ var r = ranges[i];
+ if (r.start.row > startRow)
+ break;
+
+ if (r.start.row == startRow && r.start.column >= start.column) {
+ if (r.start.column == start.column && this.$insertRight) {
+ // do nothing
+ } else {
+ r.start.column += colDiff;
+ r.start.row += lineDif;
+ }
+ }
+ if (r.end.row == startRow && r.end.column >= start.column) {
+ if (r.end.column == start.column && this.$insertRight) {
+ continue;
+ }
+ // special handling for the case when two ranges share an edge
+ if (r.end.column == start.column && colDiff > 0 && i < n - 1) {
+ if (r.end.column > r.start.column && r.end.column == ranges[i+1].start.column)
+ r.end.column -= colDiff;
+ }
+ r.end.column += colDiff;
+ r.end.row += lineDif;
}
}
- if (r.end.row == startRow && r.end.column >= start.column) {
- if (r.end.column == start.column && this.$insertRight) {
- continue;
+ } else {
+ var lineDif = startRow - endRow;
+ var colDiff = start.column - end.column;
+ for (; i < n; i++) {
+ var r = ranges[i];
+
+ if (r.start.row > endRow)
+ break;
+
+ if (r.end.row < endRow) {
+ r.end.row = startRow;
+ r.end.column = start.column;
}
- // special handling for the case when two ranges share an edge
- if (r.end.column == start.column && colDiff > 0 && i < n - 1) {
- if (r.end.column > r.start.column && r.end.column == ranges[i+1].start.column)
- r.end.column -= colDiff;
+
+ if (r.start.row < endRow || r.start.row == endRow && r.start.column <= end.colum) {
+ r.start.row = startRow;
+ r.start.column = start.column;
+ }
+
+ if (r.end.row == endRow) {
+ if (r.end.column <= end.column) {
+ if (lineDif || r.end.column > start.column) {
+ r.end.column = start.column;
+ r.end.row = start.row;
+ }
+ }
+ else {
+ r.end.column += colDiff;
+ r.end.row += lineDif;
+ }
+ }
+ if (r.start.row == endRow) {
+ if (r.start.column <= end.column) {
+ if (lineDif || r.start.column > start.column) {
+ r.start.column = start.column;
+ r.start.row = start.row;
+ }
+ }
+ else {
+ r.start.column += colDiff;
+ r.start.row += lineDif;
+ }
}
- r.end.column += colDiff;
- r.end.row += lineDif;
}
}
diff --git a/plugins/node_modules/ace/lib/ace/renderloop.js b/plugins/node_modules/ace/lib/ace/renderloop.js
index 6d31bd13..444fe19f 100644
--- a/plugins/node_modules/ace/lib/ace/renderloop.js
+++ b/plugins/node_modules/ace/lib/ace/renderloop.js
@@ -50,22 +50,23 @@ var RenderLoop = function(onRender, win) {
(function() {
-
this.schedule = function(change) {
- //this.onRender(change);
- //return;
this.changes = this.changes | change;
- if (!this.pending && this.changes) {
- this.pending = true;
+ if (this.changes) {
var _self = this;
- event.nextFrame(function() {
- _self.pending = false;
- var changes;
- while (changes = _self.changes) {
+
+ event.nextFrame(function(ts) {
+ var changes = _self.changes;
+
+ if (changes) {
+ event.blockIdle(100);
_self.changes = 0;
_self.onRender(changes);
}
- }, this.window);
+
+ if (_self.changes)
+ _self.schedule();
+ });
}
};
diff --git a/plugins/node_modules/ace/lib/ace/requirejs/text.js b/plugins/node_modules/ace/lib/ace/requirejs/text.js
index 8283c82f..f03c64c8 100644
--- a/plugins/node_modules/ace/lib/ace/requirejs/text.js
+++ b/plugins/node_modules/ace/lib/ace/requirejs/text.js
@@ -33,17 +33,17 @@
*/
(function() {
-
-var globalRequire = typeof require != "undefined" && require;
-if (typeof define !== "function") // running in webpack
- return module.exports = function(source) { return source; };
+var globalRequire = typeof require != "undefined" && require;
+if (typeof define !== "function" || (!define.amd && typeof XMLHttpRequest == "undefined")) { // running in webpack
+ return module.exports = globalRequire("./text_loader_webpack");
+}
define(function (require, exports, module) {
"use strict";
if (globalRequire && globalRequire.nodeRequire) {
module.exports = globalRequire.nodeRequire(require.toUrl("./text_build"));
} else {
- exports.load = function(name, req, onLoad, config) {
+ exports.load = function(name, req, onLoad, config) {
require("../lib/net").get(req.toUrl(name), onLoad);
};
}
diff --git a/plugins/node_modules/ace/lib/ace/requirejs/text_loader_webpack.js b/plugins/node_modules/ace/lib/ace/requirejs/text_loader_webpack.js
new file mode 100644
index 00000000..660281b9
--- /dev/null
+++ b/plugins/node_modules/ace/lib/ace/requirejs/text_loader_webpack.js
@@ -0,0 +1,45 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Ajax.org B.V. nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * used by r.js during build
+ */
+
+"use strict";
+module.exports = function(source) {
+ if (this.fs && this.resourcePath)
+ source = this.fs.readFileSync(this.resourcePath).toString("utf8");
+ source = source.replace(/\/\*(?:[^*]|[*](?=[^\/]))+\*\//g, "")
+ .replace(/^[ \t]+/gm, "");
+ var json = JSON.stringify(source)
+ .replace(/[\u2028\u2029]/g, function(x) { '\\u' + x.charCodeAt(0).toString(16); });
+
+ return "module.exports = " + json;
+};
\ No newline at end of file
diff --git a/plugins/node_modules/ace/lib/ace/selection.js b/plugins/node_modules/ace/lib/ace/selection.js
index a9dd9251..6be44c7a 100644
--- a/plugins/node_modules/ace/lib/ace/selection.js
+++ b/plugins/node_modules/ace/lib/ace/selection.js
@@ -211,6 +211,7 @@ var Selection = function(session) {
this.$setSelection = function(anchorRow, anchorColumn, cursorRow, cursorColumn) {
var wasEmpty = this.$isEmpty;
+ var wasMultiselect = this.inMultiSelectMode;
this.$silent = true;
this.$cursorChanged = this.$anchorChanged = false;
this.anchor.setPosition(anchorRow, anchorColumn);
@@ -219,7 +220,7 @@ var Selection = function(session) {
this.$silent = false;
if (this.$cursorChanged)
this._emit("changeCursor");
- if (this.$cursorChanged || this.$anchorChanged)
+ if (this.$cursorChanged || this.$anchorChanged || wasEmpty != this.$isEmpty || wasMultiselect)
this._emit("changeSelection");
};
diff --git a/plugins/node_modules/ace/lib/ace/selection_test.js b/plugins/node_modules/ace/lib/ace/selection_test.js
index 051f8748..492a64d7 100644
--- a/plugins/node_modules/ace/lib/ace/selection_test.js
+++ b/plugins/node_modules/ace/lib/ace/selection_test.js
@@ -507,6 +507,18 @@ module.exports = {
assert.equal(nCursor, 2);
assert.equal(nSelection, 3);
assert.ok(selection.isEqual(data));
+
+ selection.moveTo(0, 0);
+ nCursor = nSelection = 0;
+ selection.selectAll();
+ assert.equal(nCursor, 1);
+ assert.equal(nSelection, 1);
+ selection.moveCursorRight();
+ selection.clearSelection();
+ nCursor = nSelection = 0;
+ selection.selectAll();
+ assert.equal(nCursor, 0);
+ assert.equal(nSelection, 1);
},
"test setRange inside fold": function() {
diff --git a/plugins/node_modules/ace/lib/ace/test/assertions.js b/plugins/node_modules/ace/lib/ace/test/assertions.js
index 3a521003..771e775f 100644
--- a/plugins/node_modules/ace/lib/ace/test/assertions.js
+++ b/plugins/node_modules/ace/lib/ace/test/assertions.js
@@ -47,10 +47,34 @@ assert.notOk = function(value) {
assert.equal(value, false);
};
-exports.jsonEquals = function(foundJson, expectedJson) {
+assert.jsonEquals = function(foundJson, expectedJson) {
assert.equal(JSON.stringify(foundJson), JSON.stringify(expectedJson));
};
+assert.domNode = function(foundDom, expectedDom) {
+ if (!Array.isArray(foundDom))
+ foundDom = serializeDom(foundDom);
+ assert.deepEqual(foundDom, expectedDom);
+};
+
+function serializeDom(node) {
+ var attributes = {};
+ var attributeArray = node.attributes;
+ if (!attributeArray)
+ return node.data;
+ if (typeof attributeArray.length == "number") {
+ for (var i = 0; i < attributeArray.length; i++)
+ attributes[attributeArray[i].name] = attributeArray[i].value;
+ }
+ var result = [node.localName, attributes];
+ for (var i = 0; i < node.childNodes.length; i++) {
+ var child = serializeDom(node.childNodes[i]);
+ if (child)
+ result.push(child);
+ }
+ return result;
+}
+
module.exports = assert;
});
diff --git a/plugins/node_modules/ace/lib/ace/test/mockdom.js b/plugins/node_modules/ace/lib/ace/test/mockdom.js
index b81558fa..21febd06 100644
--- a/plugins/node_modules/ace/lib/ace/test/mockdom.js
+++ b/plugins/node_modules/ace/lib/ace/test/mockdom.js
@@ -1,10 +1,373 @@
+define(function(require, exports, module) {
"use strict";
-var jsdom = require('jsdom/').jsdom;
-var doc = jsdom("");
+var CHAR_HEIGHT = 10;
+var CHAR_WIDTH = 6;
+var WINDOW_HEIGHT = 768;
+var WINDOW_WIDTH = 1024;
-global.document = doc;
-global.window = doc.defaultView;
-global.self = doc.self;
-global.navigator = doc.navigator;
-global.location = doc.location;
+function Style() {
+
+}
+Style.prototype.__defineGetter__("cssText", function() {
+ var cssText = "";
+ Object.keys(this).forEach(function(key) {
+ if (this[key])
+ cssText += (cssText ? " " : "") + key + ": " + this[key] + ";";
+ }, this);
+ return cssText;
+});
+Style.prototype.__defineSetter__("cssText", function(value) {
+ Object.keys(this).forEach(function(key) {
+ delete this[key];
+ }, this);
+ value.split(";").forEach(function(key) {
+ var parts = key.split(":");
+ if (parts.length == 2)
+ this[parts[0].trim()] = parts[1].trim();
+ }, this);
+});
+
+
+function Node(name) {
+ this.localName = name;
+ this.value = "";
+ this.tagName = name && name.toUpperCase();
+ this.children = this.childNodes = [];
+ this.ownerDocument = global.document || this;
+ this.$attributes = {};
+ this.style = new Style();
+}
+(function() {
+ this.cloneNode = function(recursive) {
+ var clone = new Node(this.localName);
+ for (var i in this.$attributes) {
+ clone.setAttribute(i, this.$attributes[i]);
+ }
+ if (recursive) {
+ this.children.forEach(function(ch) {
+ clone.appendChild(ch.cloneNode(true));
+ }, this);
+ }
+ return clone;
+ };
+ this.appendChild = function(node) {
+ return this.insertBefore(node, null);
+ };
+ this.removeChild = function(node) {
+ var i = this.children.indexOf(node);
+ if (i == -1)
+ throw new Error("not a child");
+ node.parentNode = null;
+ this.children.splice(i, 1);
+ if (!document.contains(document.activeElement))
+ document.activeElement = document.body;
+ };
+ this.remove = function() {
+ this.parentNode && this.parentNode.removeChild(this);
+ };
+ this.replaceChild = function(node, oldNode) {
+ this.insertBefore(node, oldNode);
+ this.removeChild(oldNode);
+ return oldNode;
+ };
+ this.insertBefore = function(node, before) {
+ var i = this.children.indexOf(before);
+ if (i == -1) i = this.children.length + 1;
+ if (node.localName == "#fragment")
+ this.children.splice.apply(this.children, [i - 1, 0].concat(node.children));
+ else
+ this.children.splice(i - 1, 0, node);
+ node.parentNode = this;
+ return node;
+ };
+ this.querySelectorAll = function(s) {
+ var nodes = [];
+ walk(this, function(node) {
+ if (node.localName == s)
+ nodes.push(node);
+ });
+ return nodes;
+ };
+ this.getElementsByTagName = function(s) {
+ var nodes = [];
+ walk(this, function(node) {
+ if (node.localName == s)
+ nodes.push(node);
+ });
+ return nodes;
+ };
+ this.getElementById = function(s) {
+ return walk(this, function(node) {
+ // console.log(node.getAttribute && node.getAttribute("id"))
+ if (node.getAttribute && node.getAttribute("id") == s)
+ return node;
+ });
+ };
+ this.setAttribute = function(a, v) {
+ this.$attributes[a] = v;
+ };
+ this.getAttribute = function(a, v) {
+ return String(this.$attributes[a]);
+ };
+ this.__defineGetter__("attributes", function() {
+ var style = this.style.cssText;
+ if (style)
+ this.$attributes.style = style;
+ return Object.keys(this.$attributes).map(function(key) {
+ return {name: key, value: this.$attributes[key]};
+ }, this);
+ });
+ this.__defineGetter__("className", function() {
+ return this.$attributes.class;
+ });
+ this.__defineSetter__("className", function(v) {
+ this.$attributes.class = v;
+ });
+ this.__defineGetter__("textContent", function() {
+ var v = "";
+ walk(this, function(node) {
+ if (node instanceof TextNode)
+ v += node.data;
+ });
+ return v;
+ });
+ this.__defineSetter__("textContent", function(v) {
+ this.children.length = 0;
+ this.appendChild(new TextNode(v));
+ });
+ this.__defineGetter__("id", function() {
+ return this.getAttribute("id");
+ });
+ this.__defineSetter__("id", function(v) {
+ this.setAttribute("id", v);
+ });
+ this.__defineGetter__("parentElement", function() {
+ return this.parentNode == document ? null : this.parentNode;
+ });
+ this.__defineGetter__("innerHTML", function() {
+ return this.children.map(function(ch) {
+ return "outerHTML" in ch ? ch.outerHTML : ch.data;
+ }).join("");
+ });
+ this.__defineGetter__("outerHTML", function() {
+ var attributes = this.attributes.map(function(attr) {
+ return attr.name + "=" + JSON.stringify(attr.value);
+ }, this).join(" ");
+ return "<" + this.localName + (attributes ? " " + attributes : "") + ">" + this.innerHTML + "";
+ });
+ this.__defineSetter__("innerHTML", function(v) {
+ this.children.length = 0;
+
+ var root = this;
+ var tagRe = /<(\/?\w+)|&(?:(#?\w+);)|$/g;
+ var skipped = "";
+
+ for (var m, lastIndex = 0; m = tagRe.exec(v);) {
+ skipped += v.substring(lastIndex, m.index);
+ if (m[2]) {
+ if (m[2] == "gt") {
+ skipped += ">";
+ } else if (m[2] == "lt") {
+ skipped += "<";
+ } else if (m[2] == "amp") {
+ skipped += "&";
+ }
+ lastIndex = tagRe.lastIndex ;
+ } else {
+ if (skipped) {
+ root.appendChild(document.createTextNode(skipped));
+ skipped = "";
+ }
+ var end = v.indexOf(">", tagRe.lastIndex);
+ tagRe.lastIndex = lastIndex = end < 0 ? v.length : end + 1;
+
+ if (!m[1]) {
+ return;
+ }
+ if (m[1][0] == "/") {
+ if (root != this)
+ root = root.parentNode;
+ } else {
+ var tagName = m[1];
+ root = root.appendChild(document.createElement(tagName));
+ }
+ }
+ }
+ });
+ this.getBoundingClientRect = function(v) {
+ var w = 0;
+ var h = 0;
+ var top = 0;
+ var left = 0;
+ if (this == document.documentElement) {
+ w = WINDOW_WIDTH;
+ h = WINDOW_HEIGHT;
+ }
+ else if (!document.contains(this)) {
+ w = h = 0;
+ }
+ else if (this.style.width == "auto" || this.localName == "span") {
+ w = this.textContent.length * CHAR_WIDTH;
+ h = CHAR_HEIGHT;
+ }
+ else if (this.style.width) {
+ w = parseFloat(this.style.width) || 0;
+ h = parseFloat(this.style.height) || 0;
+ top = parseFloat(this.style.top) || 0;
+ left = parseFloat(this.style.left) || 0;
+ }
+ else if (this.style.right) {
+ var rect = this.parentNode.getBoundingClientRect();
+ w = rect.width - (parseFloat(this.style.left) || 0) - (parseFloat(this.style.right) || 0);
+ h = parseFloat(this.style.height) || rect.height;
+ top = rect.top;
+ left = rect.left + (parseFloat(this.style.left) || 0);
+ }
+ return {top: top, left: left, width: w, height: h};
+ };
+
+ this.__defineGetter__("clientHeight", function() {
+ return this.getBoundingClientRect().height;
+ });
+ this.__defineGetter__("clientWidth", function() {
+ return this.getBoundingClientRect().width;
+ });
+ this.__defineGetter__("offsetHeight", function() {
+ return this.getBoundingClientRect().height;
+ });
+ this.__defineGetter__("offsetWidth", function() {
+ return this.getBoundingClientRect().width;
+ });
+
+ this.__defineGetter__("lastChild", function() {
+ return this.childNodes[this.childNodes.length - 1];
+ });
+ this.__defineGetter__("firstChild", function() {
+ return this.childNodes[0];
+ });
+
+
+ this.addEventListener = function(name, listener, capturing) {
+ if (!this._events) this._events = {};
+ if (!this._events[name]) this._events[name] = [];
+ var i = this._events[name].indexOf(listener);
+ if (i == -1)
+ this._events[name][capturing ? "unshift" : "push"](listener);
+ };
+ this.removeEventListener = function(name, listener) {
+ if (!this._events) return;
+ if (!this._events[name]) return;
+ var i = this._events[name].indexOf(this._events[name]);
+ if (i !== -1)
+ this._events[name].splice(i, 1);
+ };
+ this.createEvent = function(v) {
+ return {
+ initMouseEvent: function(type, _1, _2, window,
+ detail, x, y, _x, _y,
+ ctrl, alt, shift, meta,
+ button, relatedTarget
+ ) {
+ this.type = type;
+ this.detail = detail || 0;
+ this.clientX = x;
+ this.clientY = y;
+ this.button = button;
+ this.relatedTarget = relatedTarget;
+ this.ctrlKey = ctrl;
+ this.altKey = alt;
+ this.shiftKey = shift;
+ this.metaKey = meta;
+ this.preventDefault = function() {};
+ this.stopPropagation = function() {
+ this.stopped = true;
+ };
+ }
+ };
+ };
+ this.dispatchEvent = function(e) {
+ if (!e.target) e.target = this;
+ e.currentTarget = this;
+ var events = this._events && this._events[e.type];
+ events && events.forEach(function(listener) {
+ if (!e.stopped)
+ listener.call(this, e);
+ }, this);
+ if (this.parentNode)
+ this.parentNode.dispatchEvent(e);
+ else if (this != window)
+ window.dispatchEvent(e);
+ };
+ this.contains = function(node) {
+ while (node) {
+ if (node == this) return true;
+ node = node.parentNode;
+ }
+ };
+ this.focus = function() {
+ if (document.activeElement == this)
+ return;
+ if (document.activeElement)
+ document.activeElement.dispatchEvent({type: "blur"});
+ document.activeElement = this;
+ this.dispatchEvent({type: "focus"});
+ };
+}).call(Node.prototype);
+
+function walk(node, fn) {
+ var ch = node.children || [];
+ for (var i = 0; i < ch.length; i++) {
+ var result = fn(ch[i]) || walk(ch[i], fn);
+ if (result)
+ return result;
+ }
+}
+
+function TextNode(value) {
+ this.data = value || "";
+}
+TextNode.prototype.cloneNode = function() {
+ return new TextNode(this.data);
+};
+var document = new Node();
+
+document.navigator = {};
+document.createElement = function(t) {
+ return new Node(t);
+};
+document.createTextNode = function(v) {
+ return new TextNode(v);
+};
+document.createDocumentFragment = function() {
+ return new Node("#fragment");
+};
+document.hasFocus = function() {
+ return true;
+};
+document.documentElement = document.appendChild(new Node("html"));
+document.body = new Node("body");
+document.head = new Node("head");
+document.documentElement.appendChild(document.head);
+document.documentElement.appendChild(document.body);
+
+var window = {};
+window.document = document;
+window.document.defaultView = window;
+
+window.setTimeout = setTimeout;
+window.clearTimeout = clearTimeout;
+window.getComputedStyle = function(node) {
+ return node.style;
+};
+window.addEventListener = document.addEventListener;
+window.removeEventListener = document.removeEventListener;
+window.dispatchEvent = document.dispatchEvent;
+window.name = "nodejs";
+window.focus = function() {};
+
+global.Node = global.Element = Node;
+global.window = window;
+global.document = document;
+
+});
diff --git a/plugins/node_modules/ace/lib/ace/undomanager.js b/plugins/node_modules/ace/lib/ace/undomanager.js
index 2091058a..27098928 100644
--- a/plugins/node_modules/ace/lib/ace/undomanager.js
+++ b/plugins/node_modules/ace/lib/ace/undomanager.js
@@ -277,6 +277,10 @@ var UndoManager = function() {
this.isClean = this.isAtBookmark;
this.markClean = this.bookmark;
+ this.$prettyPrint = function(delta) {
+ if (delta) return stringifyDelta(delta);
+ return stringifyDelta(this.$undoStack) + "\n---\n" + stringifyDelta(this.$redoStack);
+ };
}).call(UndoManager.prototype);
function rearrangeUndoStack(stack, pos) {
@@ -558,20 +562,23 @@ function moveDeltasByOne(redoStack, d) {
d = cloneDelta(d);
for (var j = redoStack.length; j--;) {
var deltaSet = redoStack[j];
- for (var i = deltaSet.length; i-- > 0;) {
+ for (var i = 0; i < deltaSet.length; i++) {
var x = deltaSet[i];
var xformed = xform(x, d);
d = xformed[0];
if (xformed.length != 2) {
if (xformed[2]) {
- redoStack.splice(i + 1, 1, xformed[1], xformed[2]);
+ deltaSet.splice(i + 1, 1, xformed[1], xformed[2]);
i++;
} else if (!xformed[1]) {
- redoStack.splice(i, 1);
+ deltaSet.splice(i, 1);
i--;
}
}
}
+ if (!deltaSet.length) {
+ redoStack.splice(j, 1);
+ }
}
return redoStack;
}
diff --git a/plugins/node_modules/ace/lib/ace/undomanager_test.js b/plugins/node_modules/ace/lib/ace/undomanager_test.js
index 4a9c1028..5265ad80 100644
--- a/plugins/node_modules/ace/lib/ace/undomanager_test.js
+++ b/plugins/node_modules/ace/lib/ace/undomanager_test.js
@@ -44,19 +44,20 @@ var EditSession = require("./edit_session").EditSession;
var MockRenderer = require("./test/mockrenderer").MockRenderer;
var UndoManager = require("./undomanager").UndoManager;
-var editor;
-
+var editor, session, undoManager;
module.exports = {
name: "ACE undoManager.js",
+ setUp: function() {
+ editor = editor || new Editor(new MockRenderer());
+ session = new EditSession("");
+ undoManager = new UndoManager();
+ session.setUndoManager(undoManager);
+ editor.setSession(session);
+ },
"test: reabsing": function() {
- var session = new EditSession("");
- var editor = new Editor(new MockRenderer(), session);
- var undoManager = new UndoManager();
- session.setUndoManager(undoManager);
-
session.setValue("012345-012345-012345");
session.insert({row: 0, column: 0}, "xx");
session.markUndoGroup();
@@ -66,9 +67,9 @@ module.exports = {
session.markUndoGroup();
editor.undo();
editor.undo();
- var rev = session.getUndoManager().startNewGroup();
+ var rev = undoManager.startNewGroup();
session.insert({row: 0, column: 5}, "z\nz");
- session.getUndoManager().markIgnored(rev);
+ undoManager.markIgnored(rev);
// editor.undo()
editor.redo();
editor.redo();
@@ -84,11 +85,6 @@ module.exports = {
assert.equal(val1, val2);
},
"test: conflicting deletes": function() {
- var session = new EditSession("");
- var editor = new Editor(new MockRenderer(), session);
- var undoManager = new UndoManager();
- session.setUndoManager(undoManager);
-
session.setValue("012345\nabcdefg\nxyz");
session.remove(new Range(0, 2, 0, 4));
assert.equal(session.getLine(0), "0145");
@@ -101,6 +97,208 @@ module.exports = {
assert.equal(session.getLine(0), "05");
editor.undo();
assert.equal(session.getLine(0), "012345");
+ },
+ "test: several deltas ignored": function() {
+ session.setValue("012345\nabcdefg\nxyz");
+ session.insert({row: 0, column: 5}, "zzzz");
+ var rev = undoManager.startNewGroup();
+ session.insert({row: 0, column: 5}, "yyyy");
+ session.insert({row: 0, column: 5}, "aaaa");
+ undoManager.markIgnored(rev, undoManager.getRevision() + 1);
+ editor.undo();
+ assert.equal(editor.getValue(), "01234aaaayyyy5\nabcdefg\nxyz");
+ },
+ "test: canUndo/canRedo and bookmarks": function() {
+ session.setValue("012345\nabcdefg\nxyz");
+ assert.ok(undoManager.isAtBookmark());
+ editor.execCommand("removewordright");
+ assert.ok(!undoManager.isAtBookmark());
+ var rev = undoManager.getRevision();
+ undoManager.bookmark();
+ assert.ok(undoManager.isAtBookmark());
+ editor.undo();
+ assert.ok(!undoManager.isAtBookmark());
+ undoManager.bookmark(rev);
+ assert.ok(!undoManager.canUndo());
+ assert.ok(undoManager.canRedo());
+ editor.redo();
+ assert.ok(undoManager.isAtBookmark());
+
+ session.insert({row: 0, column: 5}, "yyyy");
+ assert.ok(undoManager.canUndo());
+ assert.ok(!undoManager.canRedo());
+ },
+ "test: getRevision": function () {
+ session.setValue("012345\nabcdefg\nxyz");
+ session.insert({row: 0, column: 5}, "yyyy");
+ var rev = undoManager.getRevision();
+ assert.equal(rev, 2);
+ editor.undo();
+ rev = undoManager.getRevision();
+ assert.equal(rev, 0);
+ },
+ "test: swap deltas delete/insert": function () {
+ session.setValue("012345\nabcdefg\nxyz");
+ session.insert({row: 0, column: 5}, "zzzz");
+ undoManager.startNewGroup();
+ session.insert({row: 0, column: 5}, "yyyy");
+ session.remove(new Range(0, 5, 0, 9));
+ var rev = undoManager.startNewGroup();
+ session.insert({row: 0, column: 5}, "aaaa");
+ undoManager.markIgnored(rev);
+ editor.undo();
+ assert.equal(editor.getValue(), "01234aaaazzzz5\nabcdefg\nxyz");
+ },
+ "test: swap deltas insert/delete": function () {
+ session.setValue("012345");
+ undoManager.startNewGroup();
+ session.insert({row: 0, column: 5}, "yyyy");
+ var rev = undoManager.startNewGroup();
+ session.remove(new Range(0, 5, 0, 9));
+ undoManager.markIgnored(rev);
+ editor.undo();
+ assert.equal(editor.getValue(), "01234yyyy5");
+
+ editor.redo();
+ undoManager.startNewGroup();
+ session.insert({row: 0, column: 5}, "yyyy");
+ var rev1 = undoManager.startNewGroup();
+ session.remove(new Range(0, 1, 0, 4));
+ undoManager.markIgnored(rev1);
+ editor.undo();
+ assert.equal(editor.getValue(), "045");
+
+ editor.redo();
+ undoManager.startNewGroup();
+ session.insert({row: 0, column: 1}, "yyyy");
+ var rev2 = undoManager.startNewGroup();
+ session.remove(new Range(0, 7, 0, 9));
+ undoManager.markIgnored(rev2);
+ editor.undo();
+ assert.equal(editor.getValue(), "04yy5");
+ },
+ "test: swap deltas insert/insert": function () {
+ session.setValue("012345");
+ undoManager.startNewGroup();
+ session.insert({row: 0, column: 1}, "yyyy");
+ var rev = undoManager.startNewGroup();
+ session.insert({row: 0, column: 2}, "xxxx");
+ undoManager.markIgnored(rev);
+ editor.undo();
+ assert.equal(editor.getValue(), "0yyyy12345");
+
+ },
+ "test: swap deltas delete/delete": function () {
+ session.setValue("012345");
+ session.insert({row: 0, column: 5}, "zzzz");
+ undoManager.startNewGroup();
+ session.insert({row: 0, column: 5}, "yyyy");
+ session.remove(new Range(0, 5, 0, 9));
+ session.insert({row: 0, column: 5}, "aaaa");
+ var rev = undoManager.startNewGroup();
+ session.remove(new Range(0, 5, 0, 9));
+ undoManager.markIgnored(rev);
+ editor.undo();
+ assert.equal(editor.getValue(), "01234aaaazzzz5");
+
+ editor.undo();
+ assert.equal(editor.getValue(), "01234zzzz5");
+
+ editor.redo();
+ var rev1=undoManager.startNewGroup();
+ session.insert({row: 0, column: 1}, "yyyy");
+ session.remove(new Range(0, 0, 0, 1));
+ undoManager.markIgnored(rev1);
+ editor.undo();
+ assert.equal(editor.getValue(), "yyyy1234zzzz5");
+
+ undoManager.startNewGroup();
+ session.remove(new Range(0, 0, 0, 1));
+ var rev2=undoManager.startNewGroup();
+ session.remove(new Range(0, 3, 0, 5));
+ undoManager.markIgnored(rev2);
+ editor.undo();
+ assert.equal(editor.getValue(), "yyyy34zzzz5");
+
+ editor.redo();
+ undoManager.startNewGroup();
+ session.remove(new Range(0, 3, 0, 5));
+ var rev3=undoManager.startNewGroup();
+ session.remove(new Range(0, 1, 0, 5));
+ undoManager.markIgnored(rev3);
+ editor.undo();
+ assert.equal(editor.getValue(), "yyyzzzz5");
+
+ },
+ "test: xform deltas insert/insert": function () {
+ session.setValue("012345");
+ session.insert({row: 0, column: 5}, "zzzz");
+ undoManager.startNewGroup();
+ session.insert({row: 0, column: 0}, "yyyy");
+ editor.undo();
+ session.insert({row: 0, column: 5}, "aaaa");
+ editor.redo();
+ assert.equal(editor.getValue(), "yyyy01234aaaazzzz5");
+ },
+ "test: xform deltas insert/delete": function () {
+ session.setValue("012345");
+ session.insert({row: 0, column: 5}, "zzzz");
+ undoManager.startNewGroup();
+ session.insert({row: 0, column: 0}, "yyyy");
+ editor.undo();
+ session.remove(new Range(0, 0, 0, 1));
+ editor.redo();
+ assert.equal(editor.getValue(), "yyyy1234zzzz5");
+
+ session.setValue("012345");
+ session.insert({row: 0, column: 5}, "zzzz");
+ undoManager.startNewGroup();
+ var rev=undoManager.startNewGroup();
+ session.insert({row: 0, column: 0}, "yyyy");
+ undoManager.markIgnored(rev);
+ editor.undo();
+ session.remove(new Range(0, 0, 0, 1));
+ editor.redo();
+ assert.equal(editor.getValue(), "yyy01234zzzz5");
+ },
+ "test: xform deltas delete/insert": function () {
+ session.setValue("012345");
+ session.insert({row: 0, column: 0}, "yyyy");
+ undoManager.startNewGroup();
+ session.remove(new Range(0, 0, 0, 1));
+ editor.undo();
+ session.insert({row: 0, column: 5}, "zzzz");
+ editor.redo();
+ assert.equal(editor.getValue(), "yyy0zzzz12345");
+ },
+ "test: xform deltas delete/delete": function () {
+ session.setValue("012345");
+ session.insert({row: 0, column: 0}, "yyyy");
+ undoManager.startNewGroup();
+ session.remove(new Range(0, 3, 0, 4));
+ editor.undo();
+ session.remove(new Range(0, 4, 0, 5));
+ editor.redo();
+ assert.equal(editor.getValue(), "yyy12345");
+
+ session.setValue("012345");
+ session.insert({row: 0, column: 0}, "yyyy");
+ session.remove(new Range(0, 2, 0, 5));
+ assert.equal(editor.getValue(), "yy12345");
+ editor.undo();
+ assert.equal(editor.getValue(), "012345");
+ session.remove(new Range(0, 1, 0, 2));
+ editor.redo();
+ assert.equal(editor.getValue(), "yy2345");
+
+ session.setValue("1234abcd ---");
+ session.insert({row: 0, column: 0}, "ijkl");
+ session.remove(new Range(0, 2, 0, 8));
+ editor.undo();
+ session.remove(new Range(0, 4, 0, 7));
+ editor.redo();
+ assert.equal(editor.getValue(), "ijd ---");
+ assert.equal(undoManager.$prettyPrint(), '-[abc]0:4=>0:7\t(12)\n+[ijkl]0:0=>0:4\t(13)\n-[kl1234]0:2=>0:8\n---\n');
}
};
diff --git a/plugins/node_modules/ace/lib/ace/virtual_renderer.js b/plugins/node_modules/ace/lib/ace/virtual_renderer.js
index 87ee6ad3..8ed755f8 100644
--- a/plugins/node_modules/ace/lib/ace/virtual_renderer.js
+++ b/plugins/node_modules/ace/lib/ace/virtual_renderer.js
@@ -34,7 +34,6 @@ define(function(require, exports, module) {
var oop = require("./lib/oop");
var dom = require("./lib/dom");
var config = require("./config");
-var useragent = require("./lib/useragent");
var GutterLayer = require("./layer/gutter").Gutter;
var MarkerLayer = require("./layer/marker").Marker;
var TextLayer = require("./layer/text").Text;
@@ -68,6 +67,7 @@ var VirtualRenderer = function(container, theme) {
this.container = container || dom.createElement("div");
dom.addCssClass(this.container, "ace_editor");
+ if (dom.HI_DPI) dom.addCssClass(this.container, "ace_hidpi");
this.setTheme(theme);
@@ -78,6 +78,7 @@ var VirtualRenderer = function(container, theme) {
this.scroller = dom.createElement("div");
this.scroller.className = "ace_scroller";
+
this.container.appendChild(this.scroller);
this.content = dom.createElement("div");
@@ -238,7 +239,7 @@ var VirtualRenderer = function(container, theme) {
return;
this.$loop.schedule(this.CHANGE_FULL);
- // this.session.$setFontMetrics(this.$fontMetrics);
+ this.session.$setFontMetrics(this.$fontMetrics);
this.scrollBarH.scrollLeft = this.scrollBarV.scrollTop = null;
this.onChangeNewLineMode = this.onChangeNewLineMode.bind(this);
@@ -405,18 +406,20 @@ var VirtualRenderer = function(container, theme) {
this.gutterWidth = gutterWidth;
- this.scrollBarH.element.style.left =
- this.scroller.style.left = gutterWidth + "px";
+ dom.setStyle(this.scrollBarH.element.style, "left", gutterWidth + "px");
+ dom.setStyle(this.scroller.style, "left", gutterWidth + "px");
size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBarV.getWidth());
- this.scrollBarH.element.style.right =
- this.scroller.style.right = this.scrollBarV.getWidth() + "px";
- this.scroller.style.bottom = this.scrollBarH.getHeight() + "px";
+ var right = this.scrollBarV.getWidth() + "px";
+ dom.setStyle(this.scrollBarH.element.style, "right", right);
+ dom.setStyle(this.scroller.style, "right", right);
+ dom.setStyle(this.scroller.style, "bottom", this.scrollBarH.getHeight());
// this.scrollBarH.element.style.setWidth(size.scrollerWidth);
- if (this.session && this.session.getUseWrapMode() && this.adjustWrapLimit() || force)
+ if (this.session && this.session.getUseWrapMode() && this.adjustWrapLimit() || force) {
changes |= this.CHANGE_FULL;
+ }
}
size.$dirty = !width || !height;
@@ -427,8 +430,8 @@ var VirtualRenderer = function(container, theme) {
return changes;
};
- this.onGutterResize = function() {
- var gutterWidth = this.$showGutter ? this.$gutter.offsetWidth : 0;
+ this.onGutterResize = function(width) {
+ var gutterWidth = this.$showGutter ? width : 0;
if (gutterWidth != this.gutterWidth)
this.$changes |= this.$updateCachedSize(true, gutterWidth, this.$size.width, this.$size.height);
@@ -438,7 +441,6 @@ var VirtualRenderer = function(container, theme) {
this.$loop.schedule(this.CHANGE_FULL);
} else {
this.$computeLayerConfig();
- this.$loop.schedule(this.CHANGE_MARKER);
}
};
@@ -559,19 +561,6 @@ var VirtualRenderer = function(container, theme) {
return this.getOption("highlightGutterLine");
};
- this.$updateGutterLineHighlight = function() {
- var pos = this.$cursorLayer.$pixelPos;
- var height = this.layerConfig.lineHeight;
- if (this.session.getUseWrapMode()) {
- var cursor = this.session.selection.getCursor();
- cursor.column = 0;
- pos = this.$cursorLayer.getPixelPosition(cursor, true);
- height *= this.session.getRowLength(cursor.row);
- }
- this.$gutterLineHighlight.style.top = pos.top - this.layerConfig.offset + "px";
- this.$gutterLineHighlight.style.height = height + "px";
- };
-
this.$updatePrintMargin = function() {
if (!this.$showPrintMargin && !this.$printMarginEl)
return;
@@ -625,9 +614,11 @@ var VirtualRenderer = function(container, theme) {
this.$moveTextAreaToCursor = function() {
var style = this.textarea.style;
if (!this.$keepTextAreaAtCursor) {
- style.left = -100 + "px";
+ dom.translate(this.textarea, -100, 0);
return;
}
+ if (!this.$cursorLayer.$pixelPos)
+ return;
var config = this.layerConfig;
var posTop = this.$cursorLayer.$pixelPos.top;
var posLeft = this.$cursorLayer.$pixelPos.left;
@@ -635,7 +626,7 @@ var VirtualRenderer = function(container, theme) {
var h = this.lineHeight;
if (posTop < 0 || posTop > config.height - h) {
- style.top = style.left = "0";
+ dom.translate(this.textarea, 0, 0);
return;
}
@@ -650,10 +641,9 @@ var VirtualRenderer = function(container, theme) {
posLeft = this.$size.scrollerWidth - w;
posLeft += this.gutterWidth;
- style.height = h + "px";
- style.width = w + "px";
- style.left = Math.min(posLeft, this.$size.scrollerWidth - w) + "px";
- style.top = Math.min(posTop, this.$size.height - h) + "px";
+ dom.setStyle(style, "height", h + "px");
+ dom.setStyle(style, "width", w + "px");
+ dom.translate(this.textarea, Math.min(posLeft, this.$size.scrollerWidth - w), Math.min(posTop, this.$size.height - h));
};
/**
@@ -836,15 +826,20 @@ var VirtualRenderer = function(container, theme) {
this.$updateScrollBarV();
if (changes & this.CHANGE_H_SCROLL)
this.$updateScrollBarH();
- this.$gutterLayer.element.style.marginTop = (-config.offset) + "px";
- this.content.style.marginTop = (-config.offset) + "px";
- this.content.style.width = config.width + 2 * this.$padding + "px";
- this.content.style.height = config.minHeight + "px";
+
+ dom.translate(this.$gutter, 0, -config.offset);
+ dom.translate(this.content, -this.scrollLeft, -config.offset);
+
+ var width = config.width + 2 * this.$padding + "px";
+ var height = config.minHeight + "px";
+
+ dom.setStyle(this.content.style, "width", width);
+ dom.setStyle(this.content.style, "height", height);
}
// horizontal scrolling
if (changes & this.CHANGE_H_SCROLL) {
- this.content.style.marginLeft = -this.scrollLeft + "px";
+ dom.translate(this.content, -this.scrollLeft, -config.offset);
this.scroller.className = this.scrollLeft <= 0 ? "ace_scroller" : "ace_scroller ace_scroll-left";
}
@@ -857,7 +852,6 @@ var VirtualRenderer = function(container, theme) {
this.$markerFront.update(config);
this.$cursorLayer.update(config);
this.$moveTextAreaToCursor();
- this.$highlightGutterLine && this.$updateGutterLineHighlight();
this._signal("afterRender");
return;
}
@@ -869,12 +863,15 @@ var VirtualRenderer = function(container, theme) {
else
this.$textLayer.scrollLines(config);
- if (this.$showGutter)
- this.$gutterLayer.update(config);
+ if (this.$showGutter) {
+ if (changes & this.CHANGE_GUTTER)
+ this.$gutterLayer.update(config);
+ else
+ this.$gutterLayer.scrollLines(config);
+ }
this.$markerBack.update(config);
this.$markerFront.update(config);
this.$cursorLayer.update(config);
- this.$highlightGutterLine && this.$updateGutterLineHighlight();
this.$moveTextAreaToCursor();
this._signal("afterRender");
return;
@@ -893,11 +890,14 @@ var VirtualRenderer = function(container, theme) {
if (this.$showGutter)
this.$gutterLayer.update(config);
}
+ else if (changes & this.CHANGE_CURSOR) {
+ if (this.$highlightGutterLine)
+ this.$gutterLayer.updateLineHighlight(config);
+ }
if (changes & this.CHANGE_CURSOR) {
this.$cursorLayer.update(config);
this.$moveTextAreaToCursor();
- this.$highlightGutterLine && this.$updateGutterLineHighlight();
}
if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_FRONT)) {
@@ -922,7 +922,9 @@ var VirtualRenderer = function(container, theme) {
desiredHeight += this.scrollBarH.getHeight();
if (this.$maxPixelHeight && desiredHeight > this.$maxPixelHeight)
desiredHeight = this.$maxPixelHeight;
- var vScroll = height > maxHeight;
+
+ var hideScrollbars = desiredHeight <= 2 * this.lineHeight;
+ var vScroll = !hideScrollbars && height > maxHeight;
if (desiredHeight != this.desiredHeight ||
this.$size.height != this.desiredHeight || vScroll != this.$vScroll) {
@@ -1442,7 +1444,7 @@ var VirtualRenderer = function(container, theme) {
var offset = offsetX / this.characterWidth;
var col = this.$blockCursor ? Math.floor(offset) : Math.round(offset);
- var row = (y + this.scrollTop - canvasPos.top) / this.lineHeight;
+ var row = Math.floor((y + this.scrollTop - canvasPos.top) / this.lineHeight);
return this.session.screenToDocumentPosition(row, Math.max(col, 0), offsetX);
};
@@ -1615,8 +1617,7 @@ var VirtualRenderer = function(container, theme) {
};
this.setCursorStyle = function(style) {
- if (this.scroller.style.cursor != style)
- this.scroller.style.cursor = style;
+ dom.setStyle(this.scroller.style, "cursor", style);
};
/**
@@ -1624,7 +1625,7 @@ var VirtualRenderer = function(container, theme) {
*
**/
this.setMouseCursor = function(cursorStyle) {
- this.scroller.style.cursor = cursorStyle;
+ dom.setStyle(this.scroller.style, "cursor", cursorStyle);
};
this.attachToShadowRoot = function() {
@@ -1685,12 +1686,8 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
initialValue: false
},
showFoldWidgets: {
- set: function(show) {this.$gutterLayer.setShowFoldWidgets(show);},
- initialValue: true
- },
- showLineNumbers: {
set: function(show) {
- this.$gutterLayer.setShowLineNumbers(show);
+ this.$gutterLayer.setShowFoldWidgets(show);
this.$loop.schedule(this.CHANGE_GUTTER);
},
initialValue: true
@@ -1704,20 +1701,10 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
},
highlightGutterLine: {
set: function(shouldHighlight) {
- if (!this.$gutterLineHighlight) {
- this.$gutterLineHighlight = dom.createElement("div");
- this.$gutterLineHighlight.className = "ace_gutter-active-line";
- this.$gutter.appendChild(this.$gutterLineHighlight);
- return;
- }
-
- this.$gutterLineHighlight.style.display = shouldHighlight ? "" : "none";
- // if cursorlayer have never been updated there's nothing on screen to update
- if (this.$cursorLayer.$pixelPos)
- this.$updateGutterLineHighlight();
+ this.$gutterLayer.setHighlightGutterLine(shouldHighlight);
+ this.$loop.schedule(this.CHANGE_GUTTER);
},
- initialValue: false,
- value: true
+ initialValue: true
},
hScrollBarAlwaysVisible: {
set: function(val) {
@@ -1733,7 +1720,7 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
},
initialValue: false
},
- fontSize: {
+ fontSize: {
set: function(size) {
if (typeof size == "number")
size = size + "px";
diff --git a/plugins/node_modules/ace/lib/ace/virtual_renderer_test.js b/plugins/node_modules/ace/lib/ace/virtual_renderer_test.js
index 3bb98685..f58e7bc0 100644
--- a/plugins/node_modules/ace/lib/ace/virtual_renderer_test.js
+++ b/plugins/node_modules/ace/lib/ace/virtual_renderer_test.js
@@ -43,9 +43,10 @@ var assert = require("./test/assertions");
require("./ext/error_marker");
function setScreenPosition(node, rect) {
- node.getBoundingClientRect = function() {
- return { left: rect[0], top: rect[1], width: rect[2], height: rect[3] };
- };
+ node.style.left = rect[0] + "px";
+ node.style.top = rect[1] + "px";
+ node.style.width = rect[2] + "px";
+ node.style.height = rect[3] + "px";
}
var editor = null;
@@ -147,8 +148,6 @@ module.exports = {
editor.renderer.setScrollMargin(10, 10);
editor.setValue("\n\n");
editor.setValue("\n\n\n\n");
- if (editor.container.offsetWidth == undefined)
- return done(); // jsdom
editor.renderer.once("afterRender", function() {
setTimeout(function() {
done();
@@ -162,6 +161,11 @@ module.exports = {
editor.execCommand(editor.commands.byName.goToNextError);
assert.position(editor.getCursorPosition(), 1, 2);
assert.ok(editor.session.lineWidgets[1]);
+ },
+
+ "test resize": function() {
+ editor.setValue("Juhu kinners!");
+ editor.resize(true);
}
// change tab size after setDocument (for text layer)