Merge pull request #22 from unicef-polymer/develop

Develop
unicef-polymer · Nov 14, 2018 · d0a8dfb · d0a8dfb
2 parents 4024efb + b18fdf8
commit d0a8dfb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "etools-upload",
   "description": "Use to upload files",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "etools-upload.html",
   "dependencies": {
     "polymer": "Polymer/polymer#^2.0.0",

diff --git a/etools-upload.html b/etools-upload.html
@@ -297,29 +297,17 @@
         this.serverErrorMsg = null;
       }
 
+
       _fileUrlChanged(fileUrl) {
-        if (!this.isValidURL(fileUrl)) {
+        if (fileUrl && !isNaN(fileUrl)) {
+          // fileUrl is a number after the upload is finished
+          // and becomes an url after the number is saved on the object=intervention, agreement etc
           return;
         }
         this.resetStatus();
         this._filename = this.getFilenameFromURL(fileUrl);
       }
 
-      /**
-       * Absolute url str needed to work
-       * @param str
-       * @returns {boolean}
-       */
-      isValidURL(str) {
-        const pattern = new RegExp('^(https?:\\/\\/)?'+ // protocol
-            '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.?)+[a-z]{2,}|'+ // domain name
-            '((\\d{1,3}\\.){3}\\d{1,3}))?'+ // ip (v4) address
-            '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*'+ //port + path
-            '(\\?[;&amp;a-z\\d%_.~+=-]*)?'+ // query string
-            '(\\#[-a-z\\d_]*)?$','i');// hash
-        return pattern.test(str);
-      }
-
       getFilenameFromURL(url) {
         if (!url) {
           return '';
@@ -328,7 +316,7 @@
       }
 
       _showDownloadBtn(fileUrl) {
-        return !!fileUrl && this.isValidURL(fileUrl);
+        return !!fileUrl && isNaN(fileUrl);
       }
 
       _showChange(readonly, _filename, uploadInProgress) {
@@ -370,7 +358,7 @@
       }
 
       _downloadFile(e) {
-        if (!this.fileUrl || !this.isValidURL(this.fileUrl)) {
+        if (!this.fileUrl || !isNaN(this.fileUrl)) {
           return;
         }
         this.downloadFile(this._filename, this.fileUrl, this.openInNewTab);