Merge pull request #59 from unicef-polymer/develop

Develop
unicef-polymer · Jun 5, 2020 · 9dfb06a · 9dfb06a
2 parents 94dc872 + 80b4bf1
commit 9dfb06a
Show file tree

Hide file tree

Showing 5 changed files with 7,034 additions and 4,583 deletions.
diff --git a/etools-upload.d.ts b/etools-upload.d.ts
@@ -16,7 +16,7 @@ import {PolymerElement, html} from '@polymer/polymer';
 
 import {CommonMixin} from './common-mixin.js';
 
-import {RequestHelper} from './request-helper.js';
+import {RequestHelperMixin} from './request-helper-mixin';
 
 /**
  * `etools-upload`

diff --git a/etools-upload.js b/etools-upload.js
@@ -10,7 +10,7 @@ import '@polymer/paper-spinner/paper-spinner.js';
 import {CommonStyles} from "./common-styles.js";
 
 import {CommonMixin} from './common-mixin.js';
-import {RequestHelper} from './request-helper-mixin.js';
+import {RequestHelperMixin} from './request-helper-mixin.js';
 import {abortActiveRequests} from '@unicef-polymer/etools-ajax/upload-helper';
 
 /**
@@ -21,7 +21,7 @@ import {abortActiveRequests} from '@unicef-polymer/etools-ajax/upload-helper';
  * @polymer
  * @demo demo/index.html
  */
-class EtoolsUpload extends RequestHelper(CommonMixin(PolymerElement)) {
+class EtoolsUpload extends RequestHelperMixin(CommonMixin(PolymerElement)) {
   static get template() {
     // language=HTML
     return html`
@@ -361,6 +361,7 @@ class EtoolsUpload extends RequestHelper(CommonMixin(PolymerElement)) {
     if (typeof this.fileUrl === 'undefined') {
       this.resetStatus();
       this.invalid = false;
+      return;
     }
     if (this.autoValidate) {
       this.validate();