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

Merge pull request #271 from jviereck/fixes

Browse source 
Use compressed Ace version in bookmarklet build
This commit is contained in:
Fabian Jakobs 2011-05-24 07:56:47 -07:00
commit 032009501c
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build_support/editor_textarea.html
View file

@ -81,7 +81,7 @@ function inject() {
load.scripts = {};
window.__ace_shadowed_load__ = load;
load('ace-uncompressed.js', 'text!ace/css/editor.css', function() {
load('ace.js', 'text!ace/css/editor.css', function() {
var ace = window.__ace_shadowed__;
ace.options.mode = "javascript";
var Event = ace.require('pilot/event');

4
lib/ace/keyboard/state_handler.js
View file

@ -39,7 +39,7 @@ define(function(require, exports, module) {
// If you're developing a new keymapping and want to get an idea what's going
// on, then enable debugging.
var DEBUG = false;
var DEBUG = true;
function StateHandler(keymapping) {
this.keymapping = this.$buildKeymappingRegex(keymapping);
@ -197,7 +197,7 @@ StateHandler.prototype = {
// If we pressed any command key but no other key, then ignore the input.
// Otherwise "shift-" is added to the buffer, and later on "shift-g"
// which results in "shift-shift-g" which doesn't make senese.
if (hashId != 0 && (key == "" || String.fromCharCode(0))) {
if (hashId != 0 && (key == "" || key == String.fromCharCode(0))) {
return null;
}