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

Conflicts:
	editor.html
	lib/ace/virtual_renderer.js
This commit is contained in:
Fabian Jakobs 2011-01-28 09:12:13 +01:00
commit 9290595750
3 changed files with 28 additions and 0 deletions

View file

@ -253,6 +253,16 @@ exports.launch = function(env) {
return event.preventDefault(e);
});
// gutter
editor = env.editor
toggleGutter=function(){
editor.renderer.setShowGutter(!editor.renderer.showGutter)
}
//
window.ace={
editor: editor
}
};
});

View file

@ -44,4 +44,20 @@ body {
-moz-border-radius-topright: 10px;
border-top-left-radius: 4px; border-top-right-radius: 4px;
background: #DDD; color: #000;
}
#toggleGutter{
height:8px;
width:20px;
background:lightblue;
bottom:0;
position:absolute;
z-index: 1000;
-moz-border-radius-topright: 20px;
}
#toggleGutter:hover{
-moz-box-shadow: 2px -1px 5px 3px #91B6D5;
border-right: 1px solid #A1A1CF;
border-top: 1px solid #A1A1CF;
}

View file

@ -260,6 +260,8 @@ var VirtualRenderer = function(container, theme) {
};
this.setShowGutter = function(show){
if(this.showGutter === show)
return;
this.$gutter.style.display = show ? "block" : "none";
this.showGutter = show;
this.onResize(true);