X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-debug.js;h=52f214f20efbaf3c75731aa21f1053face96f0fa;hp=08eb96e5140122c82029ffbc0c03617d43249beb;hb=456d56f8dd548af35fe42dd47d66423d1b98805b;hpb=700d6c83a34e097e8438094422f5a1da03db160b diff --git a/roojs-debug.js b/roojs-debug.js index 08eb96e514..52f214f20e 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -47811,7 +47811,17 @@ Roo.htmleditor.KeyEnter.prototype = { var pc = range.closest([ 'ol', 'ul']); var pli = range.closest('li'); if (!pc || e.ctrlKey) { - sel.insertNode('br', 'after'); + // on it list, or ctrl pressed. + 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: both'); + sel.insertNode(br, 'after'); + } + this.core.undoManager.addEvent(); this.core.fireEditorEvent(e); @@ -48175,9 +48185,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