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

This commit is contained in:
Fabian Jakobs 2011-05-18 10:47:34 +02:00
commit 98bd0eeb51
3 changed files with 31 additions and 21 deletions

View file

@ -155,6 +155,8 @@ exports.launch = function(env) {
var container = document.getElementById("editor");
var cockpitInput = document.getElementById("cockpitInput");
env.editor = new Editor(new Renderer(container, theme));
window.env = env;
window.ace = env.editor;
var modes = {
text: new TextMode(),
@ -337,7 +339,7 @@ exports.launch = function(env) {
}
function onResize() {
var width = (document.documentElement.clientWidth - 300);
var width = (document.documentElement.clientWidth - 280);
container.style.width = width + "px";
cockpitInput.style.width = width + "px";
container.style.height = (document.documentElement.clientHeight - 22) + "px";
@ -531,4 +533,4 @@ exports.launch = function(env) {
}
};
});
});

View file

@ -1,6 +1,6 @@
html {
height: 100%;
width: 100%;
width: 100%;
overflow: hidden;
}
@ -24,7 +24,7 @@ body {
#editor {
position: absolute;
top: 0px;
left: 300px;
left: 280px;
bottom: 0px;
right: 0px;
background: white;
@ -44,7 +44,7 @@ body {
#cockpitInput {
position: absolute;
left: 300px;
left: 280px;
right: 0px;
bottom: 0;