Merge branch 'chromecxtmenu' into master

install.js

@@ -42,6 +42,10 @@ function getVersion(path) {
         return fs.readFileSync(path + "/.git-ref", "utf8");
     if (fs.existsSync(path + "/.git/ORIG_HEAD"))
         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 {

lib/ace/keyboard/textinput.js

@@ -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";

lib/ace/virtual_renderer.js

@@ -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";

tool/update_deps.js

@@ -19,6 +19,10 @@ var deps = [{
 	path: "mode/css/csslint.js",
 	url: "https://raw.github.com/stubbornella/csslint/master/release/csslint-node.js",
 	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) {