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

Merge pull request #257 from fivesixty/master

Browse source 
Fixes for #240/#249 and #255
This commit is contained in:
Fabian Jakobs 2011-05-23 01:51:45 -07:00
commit 17c1d1b1ae
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/ace/ace.js
View file

@ -38,6 +38,7 @@
define(function(require, exports, module) { define(function(require, exports, module) {
require("pilot/index"); require("pilot/index");
require("pilot/fixoldbrowsers");
var catalog = require("pilot/plugin_manager").catalog; var catalog = require("pilot/plugin_manager").catalog;
catalog.registerPlugins([ "pilot/index" ]); catalog.registerPlugins([ "pilot/index" ]);

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

@ -98,12 +98,17 @@ var TextInput = function(parentNode, host) {
host.onCompositionUpdate(text.value); host.onCompositionUpdate(text.value);
}; };
var onCompositionEnd = function() { var onCompositionEnd = function(e) {
inCompostion = false; inCompostion = false;
host.onCompositionEnd(); host.onCompositionEnd();
setTimeout(function () { if (useragent.isGecko) {
sendText(); sendText();
}, 0); } else {
setTimeout(function () {
if (!inCompostion)
sendText();
}, 0);
}
}; };
var onCopy = function(e) { var onCopy = function(e) {