Roo/bootstrap/CardUploader.js

[roojs1] / Roo / bootstrap / CardUploader.js

diff --git a/Roo/bootstrap/CardUploader.js b/Roo/bootstrap/CardUploader.js
index a663d26..6335075 100644 (file)
--- a/Roo/bootstrap/CardUploader.js
+++ b/Roo/bootstrap/CardUploader.js
@@ -47,7 +47,7 @@ Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Button,  {
                 btn,
                 {
                     tag : 'input',
-                    cls : 'd=none roo-card-upload-selector',
+                    cls : 'd-none roo-card-upload-selector',
                     type : 'file',
                     multiple : 'multiple'
                 },
@@ -70,6 +70,7 @@ Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Button,  {
     
     initEvents : function()
     {
+        Roo.bootstrap.Button.prototype.initEvents.call(this);
         this.urlAPI = (window.createObjectURL && window) || 
                                 (window.URL && URL.revokeObjectURL && URL) || 
                                 (window.webkitURL && webkitURL);
@@ -79,8 +80,7 @@ Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Button,  {
          
         this.selectorEl = this.el.select('.roo-card-upload-selector', true).first();
         
-        this.el.on('click', this.beforeSelectFile, this);
-        this.selectorEl.on('change', this.onFileSelected, this);
+         this.selectorEl.on('change', this.onFileSelected, this);
         if (this.images) {
             var t = this;
             this.images.forEach(function(img) {
@@ -94,7 +94,7 @@ Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Button,  {
     },
     
    
-    beforeSelectFile : function(e)
+    onClick : function(e)
     {
         e.preventDefault();
          
@@ -172,21 +172,45 @@ Roo.extend(Roo.bootstrap.CardUploader, Roo.bootstrap.Button,  {
                         // view..
                     }
                 },
-                cn : [
+                items : [
                     {
                         xns : Roo.bootstrap,
                         xtype : 'CardFooter',
-                        cn: [
+                        items: [
                             {
                                 xns : Roo.bootstrap,
                                 xtype : 'Element',
-                                html : data.title
-                            },
-                            {
-                                xns : Roo.bootstrap,
-                                xtype : 'Button',
-                                html : 'Delete',
-                                fa : 'cross'
+                                cls : 'd-flex',
+                                items : [
+                                    
+                                    {
+                                        xns : Roo.bootstrap,
+                                        xtype : 'Button',
+                                        html : String.format("<small>{0}</small>", data.title),
+                                        cls : 'col-8 text-left',
+                                        size: 'sm', 
+                                        fa : 'download',
+                                        listeners : {
+                                            click : function() {
+                                                // download
+                                            }
+                                        }
+                                    },
+                                    {
+                                        xns : Roo.bootstrap,
+                                        xtype : 'Element',
+                                        cls : 'col-1'
+                                    },
+                                    {
+                                        xns : Roo.bootstrap,
+                                        xtype : 'Button',
+                                        html : 'Delete',
+                                        size : 'sm',
+                                        weight: 'danger',
+                                        cls : 'col-3',
+                                        fa : 'times'
+                                    }
+                                ]
                             }
                             
                         ],