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

Merge branch 'master' of github.com:ajaxorg/ace

Browse source 
Conflicts:
	build/demo/kitchen-sink/kitchen-sink-uncompressed.js
	build/demo/kitchen-sink/kitchen-sink.js
	build/kitchen-sink.html
	build/src/ace-uncompressed.js
	build/src/ace.js
	build/src/keybinding-vim.js
	build/src/mode-c_cpp.js
	build/src/mode-clojure.js
	build/src/mode-coffee.js
	build/src/mode-coldfusion.js
	build/src/mode-csharp.js
	build/src/mode-css.js
	build/src/mode-groovy.js
	build/src/mode-html.js
	build/src/mode-java.js
	build/src/mode-javascript.js
	build/src/mode-json.js
	build/src/mode-markdown.js
	build/src/mode-ocaml.js
	build/src/mode-perl.js
	build/src/mode-php.js
	build/src/mode-powershell.js
	build/src/mode-python.js
	build/src/mode-ruby.js
	build/src/mode-scad.js
	build/src/mode-scala.js
	build/src/mode-scss.js
	build/src/mode-svg.js
	build/src/mode-textile.js
	build/src/worker-coffee.js
	build/src/worker-css.js
	build/src/worker-javascript.js
	build/textarea/src/ace-uncompressed.js
	build/textarea/src/ace.js
	build/textarea/src/mode-c_cpp.js
	build/textarea/src/mode-clojure.js
	build/textarea/src/mode-coffee.js
	build/textarea/src/mode-coldfusion.js
	build/textarea/src/mode-csharp.js
	build/textarea/src/mode-css.js
	build/textarea/src/mode-groovy.js
	build/textarea/src/mode-html.js
	build/textarea/src/mode-java.js
	build/textarea/src/mode-javascript.js
	build/textarea/src/mode-json.js
	build/textarea/src/mode-markdown.js
	build/textarea/src/mode-ocaml.js
	build/textarea/src/mode-perl.js
	build/textarea/src/mode-php.js
	build/textarea/src/mode-powershell.js
	build/textarea/src/mode-python.js
	build/textarea/src/mode-ruby.js
	build/textarea/src/mode-scad.js
	build/textarea/src/mode-scala.js
	build/textarea/src/mode-scss.js
	build/textarea/src/mode-svg.js
	build/textarea/src/mode-textile.js
This commit is contained in:
Fabian Jakobs 2011-11-09 11:56:39 +01:00
commit 1f6abc96b1
4 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/css/editor.css
View file

@ -4,7 +4,7 @@
.ace_editor {
position: absolute;
overflow: hidden;
font-family: 'Monaco', 'Menlo', 'Droid Sans Mono', 'Courier New', monospace;
font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Droid Sans Mono', 'Courier New', monospace;
font-size: 12px;
}

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

@ -52,7 +52,7 @@ StateHandler.prototype = {
* need to be adapted.
*/
$buildKeymappingRegex: function(keymapping) {
for (state in keymapping) {
for (var state in keymapping) {
this.$buildBindingsRegex(keymapping[state]);
}
return keymapping;

5
lib/ace/mouse/mouse_handler.js
View file

@ -57,6 +57,7 @@ var MouseHandler = function(editor) {
var mouseTarget = editor.renderer.getMouseEventTarget();
event.addListener(mouseTarget, "mousedown", this.onMouseDown.bind(this));
event.addListener(mouseTarget, "click", this.onMouseClick.bind(this));
event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this));
event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, this.onMouseDoubleClick.bind(this));
event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, this.onMouseTripleClick.bind(this));
@ -78,6 +79,10 @@ var MouseHandler = function(editor) {
this.onMouseDown = function(e) {
this.editor._dispatchEvent("mousedown", new MouseEvent(e, this.editor));
};
this.onMouseClick = function(e) {
this.editor._dispatchEvent("click", new MouseEvent(e, this.editor));
};
this.onMouseMove = function(e) {
// optimization, because mousemove doesn't have a default handler.