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

Merge pull request #1196 from ajaxorg/bugfix

Browse source 
Bugfix
This commit is contained in:
Mostafa Eweda 2013-01-13 00:39:54 -08:00
commit 7601a904cb
12 changed files with 22 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,7 @@
.ace_editor {
position: absolute;
position: relative;
overflow: hidden;
font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
font-size: 12px;
}
.ace_scroller {

9
lib/ace/ext/searchbox.css
View file

@ -9,6 +9,7 @@
border-top: 0 none;
max-width: 297px;
overflow: hidden;
margin: 0;
padding: 4px;
padding-right: 6px;
padding-bottom: 0;
@ -34,11 +35,8 @@
margin-bottom: 4px;
overflow: hidden;
}
.ace_search label {
float: left;
color: #656565;
}
.ace_search input {
.ace_search_field {
background-color: white;
border-right: 1px solid #cbcbcb;
border: 0 none;
@ -51,6 +49,7 @@
outline: 0;
padding: 0 7px;
width: 214px;
margin: 0;
}
.ace_searchbtn,
.ace_replacebtn {

4
lib/ace/ext/searchbox.js
View file

@ -43,12 +43,12 @@ dom.importCssString(searchboxCss, "ace_searchbox");
var html = '<div class="ace_search right">\
<button action="hide" class="ace_searchbtn_close"></button>\
<div class="ace_search_form">\
<input type="text" class="ace_search_field" placeholder="Search for" spellcheck="false">\
<input class="ace_search_field" placeholder="Search for" spellcheck="false">\
<button action="findNext" class="ace_searchbtn next"></button>\
<button action="findPrev" class="ace_searchbtn prev"></button>\
</div>\
<div class="ace_replace_form">\
<input type="text" class="ace_search_field" placeholder="Replace with" spellcheck="false">\
<input class="ace_search_field" placeholder="Replace with" spellcheck="false">\
<button action="replace" class="ace_replacebtn">Replace</button>\
<button action="replaceAll" class="ace_replacebtn">All</button>\
</div>\

7
lib/ace/virtual_renderer.js
View file

@ -300,10 +300,10 @@ var VirtualRenderer = function(container, theme) {
this.resizing++;
else
this.resizing = force ? 1 : 0;
if (!height)
height = dom.getInnerHeight(this.container);
if (force || size.height != height) {
if (height && (force || size.height != height)) {
size.height = height;
this.scroller.style.height = height + "px";
@ -318,7 +318,8 @@ var VirtualRenderer = function(container, theme) {
if (!width)
width = dom.getInnerWidth(this.container);
if (force || this.resizing > 1 || size.width != width) {
if (width && (force || this.resizing > 1 || size.width != width)) {
size.width = width;
var gutterWidth = this.showGutter ? this.$gutter.offsetWidth : 0;