From e605b1f6d11f7db5ae5699dcb0e23fbc9e337d2b Mon Sep 17 00:00:00 2001 From: Adriana Trif Date: Thu, 10 Aug 2017 16:23:04 +0300 Subject: [PATCH 1/4] Expose fitInto for toast msg and fix layout issue --- etools-file.html | 5 +++-- style/additional-columns-displayed-style.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etools-file.html b/etools-file.html index 602cf3f..015ab10 100644 --- a/etools-file.html +++ b/etools-file.html @@ -166,7 +166,7 @@ - + @@ -271,7 +271,8 @@ hideDeleteBtn: { type: Boolean, reflectToAttribute: true, - } + }, + toastFitInto: Object }, observers: [ diff --git a/style/additional-columns-displayed-style.html b/style/additional-columns-displayed-style.html index a689d25..cb5f059 100644 --- a/style/additional-columns-displayed-style.html +++ b/style/additional-columns-displayed-style.html @@ -15,7 +15,7 @@ } :host([activate-file-types][show-upload-date]) .file-name-wrapper { - width: calc(100% - 375px); + width: calc(100% - 385px); padding-right: 15px; box-sizing: border-box; } From 9202dcbb28ff116ff4cea2694d129ad7acbad566 Mon Sep 17 00:00:00 2001 From: Adriana Trif Date: Thu, 10 Aug 2017 16:26:24 +0300 Subject: [PATCH 2/4] Update bower.json --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 1281d8e..cb85973 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "etools-file", "description": "This element will allow you to select and prepare the files you are gonna upload.", - "version": "1.2.3", + "version": "1.2.4", "license": "https://github.com/unicef-polymer/etools-file/blob/master/LICENSE.md", "main": "etools-file.html", "dependencies": { From 48327ffaf5800d1b66bcc73a831ed38406660b7b Mon Sep 17 00:00:00 2001 From: Adriana Trif Date: Thu, 10 Aug 2017 16:29:54 +0300 Subject: [PATCH 3/4] Fix typo --- etools-file.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etools-file.html b/etools-file.html index 015ab10..eb8be52 100644 --- a/etools-file.html +++ b/etools-file.html @@ -454,7 +454,7 @@ _displayAlreadySelectedWarning: function(filesAlreadySelected) { // show a warning with the already selected files - var toastWarningMessage = '

The following file are already selected:

'; + var toastWarningMessage = '

The following files are already selected:

'; filesAlreadySelected.forEach(function(alreadySelectedFile) { toastWarningMessage += '

' + alreadySelectedFile.file_name + '

'; }); From fe9ddb4150e30151ecebea8c92d3fccf3042c696 Mon Sep 17 00:00:00 2001 From: Adriana Trif Date: Thu, 10 Aug 2017 16:42:04 +0300 Subject: [PATCH 4/4] IE fix --- etools-file.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etools-file.html b/etools-file.html index eb8be52..593c874 100644 --- a/etools-file.html +++ b/etools-file.html @@ -51,7 +51,9 @@