projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes for image tidy up on upload
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
f6d0dbb
..
419d952
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-2679,7
+2679,10
@@
Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, {
},
setHeaderText: function(html)
{
},
setHeaderText: function(html)
{
- this.headerContainerEl.dom.innerHTML = html;
+ this.header = html;
+ if (this.headerContainerEl) {
+ this.headerContainerEl.dom.innerHTML = html;
+ }
}
}
@@
-12680,7
+12683,7
@@
Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Input, {
{
xns : Roo.bootstrap,
xtype : 'CardFooter',
{
xns : Roo.bootstrap,
xtype : 'CardFooter',
- items: [
+
items: [
{
xns : Roo.bootstrap,
xtype : 'Element',
{
xns : Roo.bootstrap,
xtype : 'Element',
@@
-12691,7
+12694,7
@@
Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Input, {
xns : Roo.bootstrap,
xtype : 'Button',
html : String.format("<small>{0}</small>", data.title),
xns : Roo.bootstrap,
xtype : 'Button',
html : String.format("<small>{0}</small>", data.title),
- cls : 'col-1
1
text-left',
+ cls : 'col-1
0
text-left',
size: 'sm',
weight: 'link',
fa : 'download',
size: 'sm',
weight: 'link',
fa : 'download',
@@
-12705,10
+12708,10
@@
Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Input, {
{
xns : Roo.bootstrap,
xtype : 'Button',
{
xns : Roo.bootstrap,
xtype : 'Button',
-
+ style: 'max-height: 28px; ',
size : 'sm',
weight: 'danger',
size : 'sm',
weight: 'danger',
- cls : 'col-
1
',
+ cls : 'col-
2
',
fa : 'times',
listeners : {
click : function() {
fa : 'times',
listeners : {
click : function() {
@@
-12745,6
+12748,7
@@
Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Input, {
this.imgEl.set({ 'pointer' : 'cursor' });
}
this.imgEl.set({ 'pointer' : 'cursor' });
}
+ this.getCardFooter().addClass('p-1');
}
}