- return jsonData

an23lm · Jul 10, 2019 · 43c02bf · 43c02bf
1 parent 9a3ab5c
commit 43c02bf
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 24 deletions.
diff --git a/Demo/index.html b/Demo/index.html
@@ -9,25 +9,30 @@
 </head>
 
 <body>
-    <div class="col" id="col-1">
-        <div class="title">Bikini Bottom</div>
-        <div class="poc-wrapper" id="poc-wrapper-1"></div>
+    <div class="title">tea-plates.js</div>
+    <div class="content-wrapper">
+    <div class="content">
+        <div class="col" id="col-1">
+            <div class="title">Bikini Bottom</div>
+            <div class="poc-wrapper" id="poc-wrapper-1"></div>
+        </div>
+        <div class="col" id="col-2">
+            <div class="title">Bikini Bottom</div>
+            <div class="poc-wrapper" id="poc-wrapper-2"></div>
+        </div>
+        <div class="col" id="col-3">
+            <div class="title">Bikini Bottom</div>
+            <div class="poc-wrapper" id="poc-wrapper-3"></div>
+        </div>
+        <div class="col" id="col-4">
+            <div class="title">Bikini Bottom</div>
+            <div class="poc-wrapper" id="poc-wrapper-4"></div>
+        </div>
+        <div class="col" id="col-5">
+            <div class="title">Bikini Bottom</div>
+            <div class="poc-wrapper" id="poc-wrapper-5"></div>
+        </div>
     </div>
-    <div class="col" id="col-2">
-        <div class="title">Bikini Bottom</div>
-        <div class="poc-wrapper" id="poc-wrapper-2"></div>
-    </div>
-    <div class="col" id="col-3">
-        <div class="title">Bikini Bottom</div>
-        <div class="poc-wrapper" id="poc-wrapper-3"></div>
-    </div>
-    <div class="col" id="col-4">
-        <div class="title">Bikini Bottom</div>
-        <div class="poc-wrapper" id="poc-wrapper-4"></div>
-    </div>
-    <div class="col" id="col-5">
-        <div class="title">Bikini Bottom</div>
-        <div class="poc-wrapper" id="poc-wrapper-5"></div>
     </div>
 </body>
 

diff --git a/Demo/main.css b/Demo/main.css
@@ -1,14 +1,31 @@
 body {
     background: #f2f6f5;
     display: flex;
-    flex-flow: row nowrap;
+    flex-flow: column nowrap;
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
 }
 
+.title {
+    font-size: 3em;
+    text-align: center;
+}
+
+.content-wrapper {
+    height: 90vh;
+    overflow: auto;
+}
+
+.content {
+    min-height: 100%;
+    display: flex;
+    flex-flow: row nowrap;
+    overflow: visible;
+}
+
 .col {
     background: #93b5b3;
     width: 25vw;
-    min-height: 100vh;
+    min-height: 100%;
     margin-right: 8pt;
     border-radius: 5pt;
 }

diff --git a/Demo/main.js b/Demo/main.js
@@ -29,10 +29,7 @@ function setup() {
 
     setTimeout(() => {
         insertData(newTemplate1, () => {
-            newTemplate1.showLoading(2);
-            setTimeout(() => {
-                insertData(newTemplate1);
-            }, 5000)
+            newTemplate1.removeObjectWithUID(2);
         });
     }, 5000)
 

diff --git a/dist/tea-plates.js b/dist/tea-plates.js
@@ -196,6 +196,8 @@ class TeaPlates {
             document.getElementById(this.wrapperId).removeChild(element);
             completion();
         }, this.animationTime, element, this, index);
+
+        return this.jsonData[`uid-${uid}`];
     }
 
     pTP_CreateElementFromString(htmlString, uid = -1) {