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

1037
demo/kitchen-sink/require.js
View file

File diff suppressed because it is too large Load diff

4
install.js
View file

@ -42,6 +42,10 @@ function getVersion(path) {
return fs.readFileSync(path + "/.git-ref", "utf8"); return fs.readFileSync(path + "/.git-ref", "utf8");
if (fs.existsSync(path + "/.git/ORIG_HEAD")) if (fs.existsSync(path + "/.git/ORIG_HEAD"))
return fs.readFileSync(path + "/.git/ORIG_HEAD", "utf8"); return fs.readFileSync(path + "/.git/ORIG_HEAD", "utf8");
if (fs.existsSync(path + "/.sourcemint/source.json")) {
var json = fs.readFileSync(path + "/.sourcemint/source.json", "utf8");
return JSON.parse(json).url.split("/").pop();
}
} }
if (process.argv.indexOf("-c") > 0) try { if (process.argv.indexOf("-c") > 0) try {

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

@ -325,7 +325,7 @@ var TextInput = function(parentNode, host) {
host.renderer.$keepTextAreaAtCursor = null; host.renderer.$keepTextAreaAtCursor = null;
// on windows context menu is opened after mouseup // on windows context menu is opened after mouseup
if (useragent.isWin && (useragent.isGecko || useragent.isIE)) if (useragent.isWin)
event.capture(host.container, function(e) { event.capture(host.container, function(e) {
text.style.left = e.clientX - 2 + "px"; text.style.left = e.clientX - 2 + "px";
text.style.top = e.clientY - 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.$loop.schedule(this.CHANGE_FULL);
this.setPadding(4);
this.updateCharacterSize(); this.updateCharacterSize();
this.setPadding(4);
}; };
(function() { (function() {
@ -509,13 +509,11 @@ var VirtualRenderer = function(container, theme) {
}; };
this.$updatePrintMargin = function() { this.$updatePrintMargin = function() {
var containerEl;
if (!this.$showPrintMargin && !this.$printMarginEl) if (!this.$showPrintMargin && !this.$printMarginEl)
return; return;
if (!this.$printMarginEl) { if (!this.$printMarginEl) {
containerEl = dom.createElement("div"); var containerEl = dom.createElement("div");
containerEl.className = "ace_layer ace_print-margin-layer"; containerEl.className = "ace_layer ace_print-margin-layer";
this.$printMarginEl = dom.createElement("div"); this.$printMarginEl = dom.createElement("div");
this.$printMarginEl.className = "ace_print-margin"; this.$printMarginEl.className = "ace_print-margin";

4
tool/update_deps.js
View file

@ -19,6 +19,10 @@ var deps = [{
path: "mode/css/csslint.js", path: "mode/css/csslint.js",
url: "https://raw.github.com/stubbornella/csslint/master/release/csslint-node.js", url: "https://raw.github.com/stubbornella/csslint/master/release/csslint-node.js",
needsFixup: true needsFixup: true
}, {
path: "../../demo/kitchen-sink/require.js",
url: "https://raw.github.com/jrburke/requirejs/master/require.js",
needsFixup: false
}] }]
var download = function(href, callback) { var download = function(href, callback) {