From 8c0f9562d1b09c96c26034c13727b2587a55a9a4 Mon Sep 17 00:00:00 2001 From: Matt Pardee Date: Sat, 15 Jan 2011 05:53:55 -0800 Subject: [PATCH 1/6] Fixed clouds_midnight.js filename --- lib/ace/theme/{clouds_mignight.js => clouds_midnight.js} | 0 support/cockpit | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/ace/theme/{clouds_mignight.js => clouds_midnight.js} (100%) diff --git a/lib/ace/theme/clouds_mignight.js b/lib/ace/theme/clouds_midnight.js similarity index 100% rename from lib/ace/theme/clouds_mignight.js rename to lib/ace/theme/clouds_midnight.js diff --git a/support/cockpit b/support/cockpit index 82e2468e..6024eafb 160000 --- a/support/cockpit +++ b/support/cockpit @@ -1 +1 @@ -Subproject commit 82e2468eededd319c4a8062baf258f0f2d4f7c86 +Subproject commit 6024eafb2559208e8f439d6f25a609d8c020d214 From fbf3d7200693d612f6731688e4d1f99315f2977f Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Mon, 17 Jan 2011 08:47:15 +0100 Subject: [PATCH 2/6] potential fix for ACE used in FF plugins. --- lib/ace/renderloop.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/renderloop.js b/lib/ace/renderloop.js index 5ca491b5..3075d092 100644 --- a/lib/ace/renderloop.js +++ b/lib/ace/renderloop.js @@ -63,7 +63,7 @@ var RenderLoop = function(onRender) { } }; - if (window.postMessage) { + if (window.postMessage && window.location.protocol != "chrome:") { this.messageName = "zero-timeout-message"; From b13cbd44838bfd0226991c5db5ba8c409bc1294c Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Mon, 17 Jan 2011 11:07:53 +0100 Subject: [PATCH 3/6] update postMessage fix based on @gozala's feedback --- lib/ace/renderloop.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ace/renderloop.js b/lib/ace/renderloop.js index 3075d092..95a6b2c4 100644 --- a/lib/ace/renderloop.js +++ b/lib/ace/renderloop.js @@ -63,7 +63,7 @@ var RenderLoop = function(onRender) { } }; - if (window.postMessage && window.location.protocol != "chrome:") { + if (window.postMessage) { this.messageName = "zero-timeout-message"; @@ -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(); } From 3ee5444d10717db2d9ce2c476937b3eb1c1c003f Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Mon, 17 Jan 2011 13:01:21 +0100 Subject: [PATCH 4/6] rename css class --- lib/ace/css/editor.css | 2 +- lib/ace/theme/clouds.js | 2 +- lib/ace/theme/clouds_midnight.js | 2 +- lib/ace/theme/cobalt.js | 2 +- lib/ace/theme/dawn.js | 2 +- lib/ace/theme/idle_fingers.js | 2 +- lib/ace/theme/kr_theme.js | 2 +- lib/ace/theme/mono_industrial.js | 2 +- lib/ace/theme/monokai.js | 2 +- lib/ace/theme/pastel_on_dark.js | 2 +- lib/ace/theme/tm.css | 2 +- lib/ace/theme/twilight.js | 2 +- lib/ace/virtual_renderer.js | 2 +- tool/Theme.tmpl.css | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) 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/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_midnight.js b/lib/ace/theme/clouds_midnight.js index 1df4f0b3..21939ae5 100644 --- a/lib/ace/theme/clouds_midnight.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%; } From c5895ca019af82596b855367068cb24c79e8351e Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Mon, 17 Jan 2011 13:03:11 +0100 Subject: [PATCH 5/6] add some ideas --- doc/Editor.mm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 @@ + + + + - + + From dab3347d818a11931a7e3fcefd3b92734b9125a7 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Mon, 17 Jan 2011 13:03:57 +0100 Subject: [PATCH 6/6] update cockpit --- support/cockpit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/cockpit b/support/cockpit index 6024eafb..82e2468e 160000 --- a/support/cockpit +++ b/support/cockpit @@ -1 +1 @@ -Subproject commit 6024eafb2559208e8f439d6f25a609d8c020d214 +Subproject commit 82e2468eededd319c4a8062baf258f0f2d4f7c86