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

Merge branch 'print-margin' into use

Browse source
This commit is contained in:
Irakli Gozalishvili 2011-01-25 12:40:45 +01:00
commit f6d1f156e9
3 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,13 +32,23 @@
left: 0px; left: 0px;
} }
.ace_editor .ace_print_margin_layer {
z-index: 0;
position: absolute;
overflow: hidden;
margin: 0px;
left: 0px;
height: 100%;
width: 100%;
}
.ace_editor .ace_print_margin { .ace_editor .ace_print_margin {
position: absolute; position: absolute;
height: 100%; height: 100%;
} }
.ace_layer { .ace_layer {
z-index: 0; z-index: 1;
position: absolute; position: absolute;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
@ -56,7 +66,7 @@
} }
.ace_cursor { .ace_cursor {
z-index: 3; z-index: 4;
position: absolute; position: absolute;
} }
@ -69,20 +79,20 @@
.ace_marker-layer .ace_step { .ace_marker-layer .ace_step {
position: absolute; position: absolute;
z-index: 2; z-index: 3;
} }
.ace_marker-layer .ace_selection { .ace_marker-layer .ace_selection {
position: absolute; position: absolute;
z-index: 3; z-index: 4;
} }
.ace_marker-layer .ace_bracket { .ace_marker-layer .ace_bracket {
position: absolute; position: absolute;
z-index: 4; z-index: 5;
} }
.ace_marker-layer .ace_active_line { .ace_marker-layer .ace_active_line {
position: absolute; position: absolute;
z-index: 1; z-index: 2;
} }

5
lib/ace/theme/twilight.js
View file

@ -64,8 +64,9 @@ define(function(require, exports, module) {
}\ }\
\ \
.ace-twilight .ace_print_margin {\ .ace-twilight .ace_print_margin {\
width: 1px;\ border-left: 1px solid #3C3C3C;\
background: #e8e8e8;\ width: 100%;\
background: #242424;\
}\ }\
\ \
.ace-twilight .ace_scroller {\ .ace-twilight .ace_scroller {\

11
lib/ace/virtual_renderer.js
View file

@ -20,6 +20,7 @@
* *
* Contributor(s): * Contributor(s):
* Fabian Jakobs <fabian AT ajax DOT org> * Fabian Jakobs <fabian AT ajax DOT org>
* Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
* *
* Alternatively, the contents of this file may be used under the terms of * Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -265,13 +266,17 @@ var VirtualRenderer = function(container, theme) {
} }
this.$updatePrintMargin = function() { this.$updatePrintMargin = function() {
var containerEl
if (!this.$showPrintMargin && !this.$printMarginEl) if (!this.$showPrintMargin && !this.$printMarginEl)
return; return;
if (!this.$printMarginEl) { if (!this.$printMarginEl) {
this.$printMarginEl = document.createElement("div"); containerEl = document.createElement("div");
this.content.insertBefore(this.$printMarginEl, this.$textLayer.element); containerEl.className = "ace_print_margin_layer";
this.$printMarginEl = document.createElement("div")
this.$printMarginEl.className = "ace_print_margin"; this.$printMarginEl.className = "ace_print_margin";
containerEl.appendChild(this.$printMarginEl);
this.content.insertBefore(containerEl, this.$textLayer.element);
} }
var style = this.$printMarginEl.style; var style = this.$printMarginEl.style;