X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=50855fd1d0b0e6c75f0b39cc5d9d8fd52f16c572;hp=c66b946610cff41f1adda2c82464fc48d02b0d9d;hb=c47e24f9bde6e0a7a5994c0024daa13e7e4df117;hpb=75cbc4ce04c9c01ac47671cb01320ce699128d00 diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index c66b946610..50855fd1d0 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -26931,12 +26931,13 @@ Roo.htmleditor.KeyEnter.prototype = { var pli = range.closest('li'); if (!pc || e.ctrlKey) { // on it list, or ctrl pressed. - if (pc) { + if (!e.ctrlKey) { sel.insertNode('br', 'after'); } else { + // only do this if we have ctrl key.. var br = doc.createElement('br'); br.className = 'clear'; - br.setAttribute('style', 'clear:all'); + br.setAttribute('style', 'clear: both'); sel.insertNode(br, 'after'); } @@ -27303,9 +27304,11 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { store : { xtype : 'SimpleStore', data : [ - ['50%'], + ['100%'], ['80%'], - ['100%'] + ['50%'], + ['20%'], + ['10%'] ], fields : [ 'val'], xns : Roo.data