Refactoring and finishing tests

aphelionz · Feb 15, 2017 · f3a5e72 · f3a5e72
1 parent 443610e
commit f3a5e72
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -34,6 +34,19 @@
   </head>
     <div class="overlay"></div>
     <ipfs-api></ipfs-api>
-    <ip-app></ip-app>
+    <ip-app id="app"></ip-app>
+
+    <script>
+      if(window.location.hash) {
+        document.getElementById('app').key = window.location.hash.substr(1);
+      }
+
+      document.body.addEventListener('file-added', function(e) {
+        window.location = "/#" + e.detail;
+        document.getElementById('app').key = window.location.hash.substr(1);
+        document.getElementById('app').isUploading = false;
+        document.getElementById('app').hasContent = false;
+      });
+    </script>
   </body>
 </html>
diff --git a/src/ip-app/ip-app.html b/src/ip-app/ip-app.html
@@ -55,6 +55,11 @@ <h1>the interplanetary pastebin</h1>
           notify: true,
           type: Boolean,
           value: false
+        },
+        key: {
+          notify: true,
+          type: String,
+          observer: "_keyChanged"
         }
       },
 
@@ -65,27 +70,20 @@ <h1>the interplanetary pastebin</h1>
         }.bind(this));
       },
 
+      _keyChanged: function() {
+        document.body.dispatchEvent(new CustomEvent('get-file', { detail: this.key }));
+      },
+
       showButton: function() { this.hasContent = true; },
 
       uploadForever: function() {
         this.isUploading = true;
         document.body.dispatchEvent(new CustomEvent('add-file', {
           detail: this.$.paste.value
         }));
-
-        document.body.addEventListener('file-added', function(e) {
-          window.location = "/#" + e.detail;
-          window.location.reload();
-        }.bind(this))
       },
 
       ready: function() {
-        if(window.location.hash) {
-          document.body.dispatchEvent(new CustomEvent('get-file', {
-            detail: window.location.hash.substr(1)
-          }));
-        }
-
         setInterval(this._getPeers.bind(this), 10000);
         this._getPeers();
 

diff --git a/test/ip-app/ip-app_test.html b/test/ip-app/ip-app_test.html
@@ -74,8 +74,13 @@
           document.body.addEventListener('add-file', test);
         });
 
-        test('file added updates hash and reloads page');
-        test('document with hash dispatches get-file event');
+        test('key change dispatches get-file event', function(done) {
+          var element = fixture('basic');
+          document.body.addEventListener('get-file', function() {
+            done();
+          });
+          element.key = "lalalal";
+        });
       });
     </script>
   </body>