Merge pull request #6 from unicef-polymer/develop

Develop
unicef-polymer · Mar 8, 2017 · 127c658 · 127c658
2 parents 50e369d + 40ccb12
commit 127c658
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -25,7 +25,7 @@
 <body>
 <div class="vertical-section-container centered">
   <h3>etools-file demo</h3>
-  <!--
+
   <demo-snippet>
     <template is="dom-bind">
       <demo-helper multiple-files="{{multipleFiles}}" single-file="{{singleFile}}" files="{{files}}" file-data="{{fileData}}"></demo-helper>
@@ -90,7 +90,6 @@ <h3>etools-file demo</h3>
 
     </template>
   </demo-snippet>
-  -->
 
   <h3>Custom file array, with ids and other data, all not used properties will remain unchanged</h3>
 

diff --git a/etools-file.html b/etools-file.html
@@ -67,14 +67,14 @@
                   <span class="file-name" title="[[file.file_name]]">[[file.file_name]]</span>
                 </div>
 
-                <template is="dom-if" if="[[_showReadonlyType(file.type)]]">
+                <template is="dom-if" if="[[_showReadonlyType(file.type, readonly)]]">
                   <div class="file-type-input-wrapper">
                     <paper-input class="file-type-input" label="[[fileTypesLabel]]" 
                       value="[[_getFileTypeStr(file.type)]]"
                       placeholder="&#8212;" readonly></paper-input>
                   </div>
                 </template>
-                <template is="dom-if" if="[[_showFileType(fileTypes.length)]]">
+                <template is="dom-if" if="[[_showFileType(fileTypes.length, readonly)]]">
                   <!-- types dropdown -->
                   <paper-dropdown-menu class="type-dropdown" label="[[fileTypesLabel]]" placeholder="&#8212;" noink>
                     <paper-menu id$="typeDropdown_[[index]]" class="dropdown-content"
@@ -252,12 +252,12 @@
           }
         },
 
-        _showFileType: function(fileTypesLength) {
-          return this.activateFileTypes && fileTypesLength > 0 && this.readonly === false;
+        _showFileType: function(fileTypesLength, readonly) {
+          return this.activateFileTypes && fileTypesLength > 0 && readonly === false;
         },
 
-        _showReadonlyType(fileType) {
-          return this.readonly && this.activateFileTypes;
+        _showReadonlyType: function(fileType, readonly) {
+          return readonly && this.activateFileTypes;
         },
 
         _getFileTypeStr: function(fileType) {
@@ -382,7 +382,7 @@
           return fileAlreadySelected;
         },
 
-        _displayAlreadySelectedWarning(filesAlreadySelected) {
+        _displayAlreadySelectedWarning: function(filesAlreadySelected) {
           // show a warning with the already selected files
           var toastWarningMessage = '<p><strong>The following file are already selected:</strong><p>';
           filesAlreadySelected.forEach(function(alreadySelectedFile) {

diff --git a/style/etools-file-style.html b/style/etools-file-style.html
@@ -155,17 +155,10 @@
         color: var(--etools-file-delete-btn-color, #f1572a);
       }
 
-      .files-container.multiple .files-wrapper {
-        @apply(--layout-flex);
-      }
-
       .files-container.multiple .upload-button-wrapper {
         @apply(--layout-vertical);
         @apply(--layout-end-justified);
       }
-      .files-container .upload-button-wrapper > span {
-        @apply(--layout);
-      }
 
       .files-container.multiple {
         @apply(--layout-vertical);