Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81350b4d authored by Raj Khemani's avatar Raj Khemani
Browse files

Merge branch '29_button_click_fix' into 'main' 

Fix unintended button click

Closes #29

See merge request !54
parents 3833663e cbc3435c

app/public/css/styles.css

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,10 @@ button.next:disabled { 
  margin: 25px auto 50px auto;

  padding: 32px;

}

.card.done {

  background: var(--card-disabled-bg);

  pointer-events: none;

}

.card-header {

  font-size: 24px;

  font-family: "Century Gothic";

app/public/css/theme.css

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
  --base-color: #dedee5;

  --secondary-color: #898989;

  --base-color-alt: #f5f5f7;

  --card-disabled-bg: #eef3fb;

  --blue: #2a7ae2;

  --white: white;

  --green: #00b13c;

app/src/viewManager.js

+7 −3
Original line number Diff line number Diff line
@@ -32,9 +32,13 @@ export default class ViewManager { 
      $copyStep.id = step.id;

      $copyStep.classList.add("active");

      $copyStep.classList.remove("inactive");

      $copyStep.addEventListener("click", async () => {

        this.executeStep($copyStep, step.name);

      const $button = $copyStep.querySelector("button");

      if ($button) {

        $button.addEventListener("click", async (event) => {

          event.stopPropagation();

          await this.executeStep($button, step.name);

        });

      }

      let $processCtn = document.getElementById("process-ctn");

      if ($processCtn) {

        $processCtn.appendChild($copyStep);