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

Merge pull request #2138 from ajaxorg/demo/warn

Browse source 
show warning if build/src/ace.js is missing
This commit is contained in:
Ruben Daniels 2014-09-12 20:17:56 +02:00
commit c029ba57c5
2 changed files with 51 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
doc/site/js/main.js
View file

@ -1,6 +1,7 @@
var editor; var editor;
var embedded_editor; var embedded_editor;
$(function() { $(function() {
if (typeof ace !== "undefined") {
ace.config.set("workerPath", "build/src-min"); ace.config.set("workerPath", "build/src-min");
editor = ace.edit("ace_editor_demo"); editor = ace.edit("ace_editor_demo");
editor.container.style.opacity = ""; editor.container.style.opacity = "";
@ -33,7 +34,16 @@ $(function() {
enableBasicAutocompletion: true enableBasicAutocompletion: true
}); });
}); });
} else {
document.body.insertAdjacentHTML("afterbegin", '<div class="bs-docs-example">\
<div class="alert alert-error">\
<button type="button" class="close" data-dismiss="alert">\xd7</button>\
<strong>Oh No!</strong> Couldn\'t load <code>build/src/ace.js</code>.<br>\
You can build it by running <code>node Makefile.dryice.js</code><br>\
Or download older version by running <code>git submodule update --init --recursive</code><br>\
</div>\
</div>');
}
$("ul.menu-list").mousedown(function(e) { $("ul.menu-list").mousedown(function(e) {
if (e.button === 1) { if (e.button === 1) {
e.preventDefault(); e.preventDefault();

5
lib/ace/lib/event.js
View file

@ -239,7 +239,7 @@ function normalizeCommandKeys(callback, e, keyCode) {
return; return;
} }
if (keyCode === 18 || keyCode === 17) { if (keyCode === 18 || keyCode === 17) {
var location = e.location || e.keyLocation; var location = "location" in e ? e.location : e.keyLocation;
if (keyCode === 17 && location === 1) { if (keyCode === 17 && location === 1) {
ts = e.timeStamp; ts = e.timeStamp;
} else if (keyCode === 18 && hashId === 3 && location === 2) { } else if (keyCode === 18 && hashId === 3 && location === 2) {
@ -275,7 +275,8 @@ function normalizeCommandKeys(callback, e, keyCode) {
} }
if (!hashId && keyCode === 13) { if (!hashId && keyCode === 13) {
if (e.location || e.keyLocation === 3) { var location = "location" in e ? e.location : e.keyLocation;
if (location === 3) {
callback(e, hashId, -keyCode); callback(e, hashId, -keyCode);
if (e.defaultPrevented) if (e.defaultPrevented)
return; return;