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

Merge branch 'chromecxtmenu' into master

Browse source
This commit is contained in:
nightwing 2012-10-29 13:02:27 +04:00
commit e0a2e1c688
5 changed files with 526 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/keyboard/textinput.js
View file

@ -325,7 +325,7 @@ var TextInput = function(parentNode, host) {
host.renderer.$keepTextAreaAtCursor = null;
// on windows context menu is opened after mouseup
if (useragent.isWin && (useragent.isGecko || useragent.isIE))
if (useragent.isWin)
event.capture(host.container, function(e) {
text.style.left = e.clientX - 2 + "px";
text.style.top = e.clientY - 2 + "px";

6
lib/ace/virtual_renderer.js
View file

@ -164,8 +164,8 @@ var VirtualRenderer = function(container, theme) {
);
this.$loop.schedule(this.CHANGE_FULL);
this.setPadding(4);
this.updateCharacterSize();
this.setPadding(4);
};
(function() {
@ -509,13 +509,11 @@ var VirtualRenderer = function(container, theme) {
};
this.$updatePrintMargin = function() {
var containerEl;
if (!this.$showPrintMargin && !this.$printMarginEl)
return;
if (!this.$printMarginEl) {
containerEl = dom.createElement("div");
var containerEl = dom.createElement("div");
containerEl.className = "ace_layer ace_print-margin-layer";
this.$printMarginEl = dom.createElement("div");
this.$printMarginEl.className = "ace_print-margin";