projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add simple interval support to Date.getElapsed()
[roojs1]
/
roojs-ui-debug.js
diff --git
a/roojs-ui-debug.js
b/roojs-ui-debug.js
index
71a05c6
..
2438433
100644
(file)
--- a/
roojs-ui-debug.js
+++ b/
roojs-ui-debug.js
@@
-23520,6
+23520,7
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
data : [
['auto'],
['50%'],
data : [
['auto'],
['50%'],
+ ['80%'],
['100%']
],
fields : [ 'val'],
['100%']
],
fields : [ 'val'],
@@
-23602,7
+23603,7
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
var d = document.createElement('div');
d.innerHTML = this.caption;
var d = document.createElement('div');
d.innerHTML = this.caption;
- var m = this.width
== '5
0%' && this.align == 'center' ? '0 auto' : 0;
+ var m = this.width
!= '10
0%' && this.align == 'center' ? '0 auto' : 0;
var iw = this.align == 'center' ? this.width : '100%';
var img = {
var iw = this.align == 'center' ? this.width : '100%';
var img = {
@@
-23667,7
+23668,8
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
maxWidth : this.align == 'center' ? '100% !important' : (this.width + ' !important'),
width : this.align == 'center' ? '100%' : this.width,
margin: '0px',
maxWidth : this.align == 'center' ? '100% !important' : (this.width + ' !important'),
width : this.align == 'center' ? '100%' : this.width,
margin: '0px',
- padding: '10px'
+ padding: '10px',
+ textAlign : this.align // seems to work for email..
},
},
@@
-23695,7
+23697,8
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
{
tag: 'div',
style : {
{
tag: 'div',
style : {
- 'margin-top' : '16px'
+ marginTop : '16px',
+ textAlign : 'left'
},
align: 'left',
cn : [
},
align: 'left',
cn : [
@@
-25611,7
+25614,7
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
new Roo.htmleditor.FilterStyleToTag({ node : d });
new Roo.htmleditor.FilterAttributes({
node : d,
new Roo.htmleditor.FilterStyleToTag({ node : d });
new Roo.htmleditor.FilterAttributes({
node : d,
- attrib_white : ['href', 'src', 'name', 'align'],
+ attrib_white : ['href', 'src', 'name', 'align'
, 'colspan', 'rowspan'
],
attrib_clean : ['href', 'src' ]
});
new Roo.htmleditor.FilterBlack({ node : d, tag : this.black});
attrib_clean : ['href', 'src' ]
});
new Roo.htmleditor.FilterBlack({ node : d, tag : this.black});
@@
-29871,7
+29874,7
@@
Roo.extend(Roo.form.Form, Roo.form.BasicForm, {
* @cfg {String} itemCls A css class to apply to the x-form-item of fields. This property cascades to child containers.
*/
/**
* @cfg {String} itemCls A css class to apply to the x-form-item of fields. This property cascades to child containers.
*/
/**
- * @cfg {String} buttonAlign Valid values are "left," "center" and "right" (defaults to "center")
+ * @cfg {String}
(left|center|right)
buttonAlign Valid values are "left," "center" and "right" (defaults to "center")
*/
buttonAlign:'center',
*/
buttonAlign:'center',
@@
-29881,7
+29884,7
@@
Roo.extend(Roo.form.Form, Roo.form.BasicForm, {
minButtonWidth:75,
/**
minButtonWidth:75,
/**
- * @cfg {String} labelAlign Valid values are "left," "top" and "right" (defaults to "left").
+ * @cfg {String} labelAlign
(left|top|right)
Valid values are "left," "top" and "right" (defaults to "left").
* This property cascades to child containers if not set.
*/
labelAlign:'left',
* This property cascades to child containers if not set.
*/
labelAlign:'left',
@@
-36942,7
+36945,7
@@
Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
* @cfg {Roo.grid.ColumnModel} cm[] The columns of the grid
*/
/**
* @cfg {Roo.grid.ColumnModel} cm[] The columns of the grid
*/
/**
- * @cfg {Roo.
grid
.Store} ds The data store for the grid
+ * @cfg {Roo.
data
.Store} ds The data store for the grid
*/
/**
* @cfg {Roo.Toolbar} toolbar a toolbar for buttons etc.
*/
/**
* @cfg {Roo.Toolbar} toolbar a toolbar for buttons etc.