projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix css for date
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
c66b946
..
50855fd
100644
(file)
--- 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.
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 {
sel.insertNode('br', 'after');
} else {
+ // only do this if we have ctrl key..
var br = doc.createElement('br');
br.className = 'clear';
var br = doc.createElement('br');
br.className = 'clear';
- br.setAttribute('style', 'clear:
all
');
+ br.setAttribute('style', 'clear:
both
');
sel.insertNode(br, 'after');
}
sel.insertNode(br, 'after');
}
@@
-27303,9
+27304,11
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
store : {
xtype : 'SimpleStore',
data : [
store : {
xtype : 'SimpleStore',
data : [
- ['
5
0%'],
+ ['
10
0%'],
['80%'],
['80%'],
- ['100%']
+ ['50%'],
+ ['20%'],
+ ['10%']
],
fields : [ 'val'],
xns : Roo.data
],
fields : [ 'val'],
xns : Roo.data