From 29e43707e05cd9dbac1f3d524cbb78d5b4edf1a0 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 15 Nov 2012 05:25:48 -0500 Subject: [PATCH] fixed bug with positioning of CodeMirror on the right panel --- ChangeLog | 5 ++++- lib/client/editor/_codemirror.js | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbcd31f4..30cdfe40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,7 +87,10 @@ dom.js and util.js. * CodeMirror upgraded to version 2.35.0. -* Fixed bug with keys panel and fm bottom margin. +* Fixed bug with keys panel and fm bottom margin, +when CodeMirror is open on the right panel. + +* Fixed bug with positioning of CodeMirror on the right panel. 2012.10.01, Version 0.1.7 diff --git a/lib/client/editor/_codemirror.js b/lib/client/editor/_codemirror.js index 063e4ad9..7fa051a8 100644 --- a/lib/client/editor/_codemirror.js +++ b/lib/client/editor/_codemirror.js @@ -71,15 +71,15 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror; 'font-family :\'Droid Sans Mono\';' + 'font-size :15px;' + /* codemirror v3 */ - //'height : ' + cloudcmd.HEIGHT + 'px' + + //'height : ' + cloudcmd.HEIGHT + 'px' + '}' + '.CodeMirror-scroll{' + - 'height : ' + (cloudcmd.HEIGHT) + 'px' + - '}', //+ - /* codemirror v3 */ - //'#CodeMirrorEditor{' + - // 'padding :20px 20px 20px 20px;' + - // '}' + 'height : ' + cloudcmd.HEIGHT + 'px' + + '}' + + '#CodeMirrorEditor{' + + 'float: right' + + // 'padding :20px 20px 20px 20px;' + + '}', parent: document.head }, lDir + 'codemirror.css',