diff --git a/doc/Editor.mm b/doc/Editor.mm index 57208079..ebcd7a5f 100644 --- a/doc/Editor.mm +++ b/doc/Editor.mm @@ -40,7 +40,7 @@ - + @@ -50,8 +50,13 @@ + + + + - + + diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index dc7db9db..cd537ddd 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -32,7 +32,7 @@ left: 0px; } -.ace_editor .ace_printMargin { +.ace_editor .ace_print_margin { position: absolute; height: 100%; } diff --git a/lib/ace/renderloop.js b/lib/ace/renderloop.js index 5ca491b5..95a6b2c4 100644 --- a/lib/ace/renderloop.js +++ b/lib/ace/renderloop.js @@ -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(); } diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 47931808..95b1d94a 100644 --- a/lib/ace/theme/clouds.js +++ b/lib/ace/theme/clouds.js @@ -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;\ }\ diff --git a/lib/ace/theme/clouds_mignight.js b/lib/ace/theme/clouds_midnight.js similarity index 98% rename from lib/ace/theme/clouds_mignight.js rename to lib/ace/theme/clouds_midnight.js index 1df4f0b3..21939ae5 100644 --- a/lib/ace/theme/clouds_mignight.js +++ b/lib/ace/theme/clouds_midnight.js @@ -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;\ }\ diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index cfc6d134..52b8af53 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -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;\ }\ diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index 203c556f..36b468de 100644 --- a/lib/ace/theme/dawn.js +++ b/lib/ace/theme/dawn.js @@ -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;\ }\ diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index 75abf1cd..41fc98fd 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -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;\ }\ diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 49675115..a21e9a2a 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -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;\ }\ diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index 529514f7..128d7c33 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -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;\ }\ diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index b146f9f9..fe3e9fcb 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -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;\ }\ diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js index 14c31c9f..2c5b49a2 100644 --- a/lib/ace/theme/pastel_on_dark.js +++ b/lib/ace/theme/pastel_on_dark.js @@ -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;\ }\ diff --git a/lib/ace/theme/tm.css b/lib/ace/theme/tm.css index fc12dc9e..0993335c 100644 --- a/lib/ace/theme/tm.css +++ b/lib/ace/theme/tm.css @@ -22,7 +22,7 @@ padding-right: 6px; } -.ace-tm .ace_editor .ace_printMargin { +.ace-tm .ace_print_margin { width: 1px; background: #e8e8e8; } diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 137d2b47..4d27f963 100644 --- a/lib/ace/theme/twilight.js +++ b/lib/ace/theme/twilight.js @@ -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;\ }\ diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index b38bc6fc..45f61c0f 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -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; diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 9d2c5107..ab240e67 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -22,7 +22,7 @@ padding-right: 6px; } -.%cssClass% .ace_editor .ace_printMargin { +.%cssClass% .ace_print_margin { width: 1px; background: %printMargin%; }