Merge pull request #8 from DSDmark/test

update

Author: DSDmark

assets/js/index.js

@@ -19,12 +19,9 @@ const BubbleSort = {
     ctx.clearRect(0, 0, CH, CW)
     const lineSpacing = 10
     ctx.lineWidth = 5
-<<<<<<< HEAD
     for (let j = 1; j < this.seedValue.length; j++) {
-=======
 
     for (let j = 0; j < this.seedValue.length; j++) {
->>>>>>> 141ad495338db7854c07ee1ae9ffeeb6ebc6f429
       const y = j * lineSpacing
       ctx.beginPath()
       ctx.moveTo(y, CH)
@@ -40,7 +37,8 @@ const BubbleSort = {
         ctx.stroke()
       }
     }
-  },
+  }
+},
   update() {
 
     if (this.seedValue[this.j] > this.seedValue[this.j + 1]) {
@@ -82,8 +80,7 @@ const BubbleSort = {
 // You could use window.requestAnimationFrame as well. but, for simplicity i'm using setInterval.
         let cleaer;
    stopButton.addEventListener('click',()=>{
-// p
-         //  clearInterval(cleaer);
+         clearInterval(cleaer);
    }   )
 function render() {
   BubbleSort.startup()

assets/style/style.css

@@ -1,5 +1,4 @@
 body{
-<<<<<<< HEAD
         display:grid;
         place-items:center;
         min-height:100vh;
@@ -20,12 +19,4 @@ body{
   width: auto;
   height:auto;
 } 
-=======
-    background-color: gray;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    min-height: 100vh;
-    overflow: hidden;
-}
->>>>>>> 141ad495338db7854c07ee1ae9ffeeb6ebc6f429
+   

index.html

@@ -69,11 +69,10 @@
           /> </label
         ><br />
       </div>
-      <canvas id="cvs"></canvas>
-    </div>
     <!-- The main section when all things will heppening -->
           <!-- The main section when all things will heppening -->
     <canvas id="cvs"></canvas>
+    </div>
     <script src="./assets/js/index.js"></script>
   </body>
 </html>