projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
267f6bc
)
fix docs
author
Alan Knowles
<alan@roojs.com>
Wed, 25 Nov 2020 09:39:51 +0000
(17:39 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 25 Nov 2020 09:39:51 +0000
(17:39 +0800)
Roo/bootstrap/CardUploader.js
patch
|
blob
|
history
css-bootstrap4/bootstrap.css.map
patch
|
blob
|
history
css-bootstrap4/bootstrap.min.css.map
patch
|
blob
|
history
css-bootstrap4/roojs-bootstrap-debug.css.map
patch
|
blob
|
history
css-bootstrap4/roojs-bootstrap.css.map
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/CardUploader.js
b/Roo/bootstrap/CardUploader.js
index
d5e87b0
..
b1c7980
100644
(file)
--- a/
Roo/bootstrap/CardUploader.js
+++ b/
Roo/bootstrap/CardUploader.js
@@
-8,8
+8,9
@@
* @extends Roo.bootstrap.Button
* Bootstrap Card Uploader class - it's a button which when you add files to it, adds cards below with preview and the name...
* @cfg {Number} errorTimeout default 3000
* @extends Roo.bootstrap.Button
* Bootstrap Card Uploader class - it's a button which when you add files to it, adds cards below with preview and the name...
* @cfg {Number} errorTimeout default 3000
- * @cfg {Boolean} name the field name for each image..
* @cfg {Array} images an array of ?? Img objects ??? when loading existing files..
* @cfg {Array} images an array of ?? Img objects ??? when loading existing files..
+ * @cfg {Array} html The button text.
+
*
* @constructor
* Create a new CardUploader
*
* @constructor
* Create a new CardUploader
@@
-78,9
+79,7
@@
Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Input, {
]
};
]
};
-
-
return cfg;
},
return cfg;
},
@@
-105,7
+104,7
@@
Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Input, {
xtype : 'Button',
container_method : 'getButtonContainer' ,
xtype : 'Button',
container_method : 'getButtonContainer' ,
- html :
'Upload File / Images'
, // fix changable?
+ html :
this.html
, // fix changable?
cls : 'w-100 ',
listeners : {
'click' : function(btn, e) {
cls : 'w-100 ',
listeners : {
'click' : function(btn, e) {
diff --git
a/css-bootstrap4/bootstrap.css.map
b/css-bootstrap4/bootstrap.css.map
index
9459d7b
..
fe31aca
100644
(file)
--- a/
css-bootstrap4/bootstrap.css.map
+++ b/
css-bootstrap4/bootstrap.css.map
@@
-2,7
+2,7
@@
"version": 3,
"file": "bootstrap.css",
"sources": [
"version": 3,
"file": "bootstrap.css",
"sources": [
- "../../../../../tmp/scss
tgMQQt
",
+ "../../../../../tmp/scss
G60wkh
",
"../scss/bootstrap/_functions.scss",
"../scss/bootstrap/_variables.scss",
"../scss/bootstrap/bootstrap.scss",
"../scss/bootstrap/_functions.scss",
"../scss/bootstrap/_variables.scss",
"../scss/bootstrap/bootstrap.scss",
diff --git
a/css-bootstrap4/bootstrap.min.css.map
b/css-bootstrap4/bootstrap.min.css.map
index
63ea4ee
..
1724e49
100644
(file)
--- a/
css-bootstrap4/bootstrap.min.css.map
+++ b/
css-bootstrap4/bootstrap.min.css.map
@@
-2,7
+2,7
@@
"version": 3,
"file": "bootstrap.min.css",
"sources": [
"version": 3,
"file": "bootstrap.min.css",
"sources": [
- "../../../../../tmp/scss
tgMQQt
",
+ "../../../../../tmp/scss
G60wkh
",
"../scss/bootstrap/_functions.scss",
"../scss/bootstrap/_variables.scss",
"../scss/bootstrap/bootstrap.scss",
"../scss/bootstrap/_functions.scss",
"../scss/bootstrap/_variables.scss",
"../scss/bootstrap/bootstrap.scss",
diff --git
a/css-bootstrap4/roojs-bootstrap-debug.css.map
b/css-bootstrap4/roojs-bootstrap-debug.css.map
index
cf4c35e
..
e5a9b1c
100644
(file)
--- a/
css-bootstrap4/roojs-bootstrap-debug.css.map
+++ b/
css-bootstrap4/roojs-bootstrap-debug.css.map
@@
-2,7
+2,7
@@
"version": 3,
"file": "roojs-bootstrap-debug.css",
"sources": [
"version": 3,
"file": "roojs-bootstrap-debug.css",
"sources": [
- "../../../../../tmp/scss
YzCtPq
",
+ "../../../../../tmp/scss
ngeTBg
",
"../scss/bootstrap/_functions.scss",
"../scss/bootstrap/_variables.scss",
"../scss/roojs-bootstrap/roojs-bootstrap.scss",
"../scss/bootstrap/_functions.scss",
"../scss/bootstrap/_variables.scss",
"../scss/roojs-bootstrap/roojs-bootstrap.scss",
diff --git
a/css-bootstrap4/roojs-bootstrap.css.map
b/css-bootstrap4/roojs-bootstrap.css.map
index
3e9ac26
..
0e4ff77
100644
(file)
--- a/
css-bootstrap4/roojs-bootstrap.css.map
+++ b/
css-bootstrap4/roojs-bootstrap.css.map
@@
-2,7
+2,7
@@
"version": 3,
"file": "roojs-bootstrap.css",
"sources": [
"version": 3,
"file": "roojs-bootstrap.css",
"sources": [
- "../../../../../tmp/scss
YzCtPq
",
+ "../../../../../tmp/scss
ngeTBg
",
"../scss/bootstrap/_functions.scss",
"../scss/bootstrap/_variables.scss",
"../scss/roojs-bootstrap/roojs-bootstrap.scss",
"../scss/bootstrap/_functions.scss",
"../scss/bootstrap/_variables.scss",
"../scss/roojs-bootstrap/roojs-bootstrap.scss",