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

Merge branch 'master' into worker

Browse source
This commit is contained in:
Fabian Jakobs 2011-01-18 08:35:36 +01:00
commit 8bb97fbbea
16 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@
left: 0px;
}
.ace_editor .ace_printMargin {
.ace_editor .ace_print_margin {
position: absolute;
height: 100%;
}

2
lib/ace/renderloop.js
View file

@ -71,7 +71,7 @@ var RenderLoop = function(onRender) {
if (!this.attached) {
var _self = this;
event.addListener(window, "message", function(e) {
if (e.source == window && _self.callback && e.data == _self.messageName) {
if (_self.callback && e.data == _self.messageName) {
event.stopPropagation(e);
_self.callback();
}

2
lib/ace/theme/clouds.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-clouds .ace_editor .ace_printMargin {\
.ace-clouds .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/clouds_mignight.js → lib/ace/theme/clouds_midnight.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-clouds-midnight .ace_editor .ace_printMargin {\
.ace-clouds-midnight .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/cobalt.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-cobalt .ace_editor .ace_printMargin {\
.ace-cobalt .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/dawn.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-dawn .ace_editor .ace_printMargin {\
.ace-dawn .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/idle_fingers.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-idle-fingers .ace_editor .ace_printMargin {\
.ace-idle-fingers .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/kr_theme.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-kr-theme .ace_editor .ace_printMargin {\
.ace-kr-theme .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/mono_industrial.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-mono-industrial .ace_editor .ace_printMargin {\
.ace-mono-industrial .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/monokai.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-monokai .ace_editor .ace_printMargin {\
.ace-monokai .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/pastel_on_dark.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-pastel-on-dark .ace_editor .ace_printMargin {\
.ace-pastel-on-dark .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/tm.css
View file

@ -22,7 +22,7 @@
padding-right: 6px;
}
.ace-tm .ace_editor .ace_printMargin {
.ace-tm .ace_print_margin {
width: 1px;
background: #e8e8e8;
}

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

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-twilight .ace_editor .ace_printMargin {\
.ace-twilight .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/virtual_renderer.js
View file

@ -270,8 +270,8 @@ var VirtualRenderer = function(container, theme) {
if (!this.$printMarginEl) {
this.$printMarginEl = document.createElement("div");
this.$printMarginEl.className = "ace_printMargin";
this.content.insertBefore(this.$printMarginEl, this.$textLayer.element);
this.$printMarginEl.className = "ace_print_margin";
}
var style = this.$printMarginEl.style;