Merge pull request #11719 from rtibbles/double_click_blocking

Removes inconsistently applied and mostly no-op double click blocking.
learningequality · Feb 27, 2024 · 91f0b3e · 91f0b3e
2 parents 51a7503 + 4d442d6
commit 91f0b3e
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 45 deletions.
diff --git a/kolibri/core/assets/src/state/modules/core/actions.js b/kolibri/core/assets/src/state/modules/core/actions.js
@@ -92,22 +92,6 @@ export function handleApiError(store, { error, reloadOnReconnect = false } = {})
   throw error;
 }
 
-/**
- * Used to prevent inadvertent actions if a user double-clicks to navigate
- *
- * Something of a hack. A better strategy would be to create a new
- * `setLoading` action which handles both `state.core.loading` and
- * `state.core.blockDoubleClicks` with a single function.
- */
-export function blockDoubleClicks(store) {
-  if (!store.state.blockDoubleClicks) {
-    store.commit('CORE_BLOCK_CLICKS', true);
-    setTimeout(() => {
-      store.commit('CORE_BLOCK_CLICKS', false);
-    }, 500);
-  }
-}
-
 export function setSession(store, { session, clientNow }) {
   const serverTime = session.server_time;
   if (clientNow) {

diff --git a/kolibri/core/assets/src/state/modules/core/index.js b/kolibri/core/assets/src/state/modules/core/index.js
@@ -10,7 +10,6 @@ export default {
   state() {
     return {
       error: '',
-      blockDoubleClicks: false,
       loading: true,
       pageSessionId: 0,
       totalProgress: null,

diff --git a/kolibri/core/assets/src/state/modules/core/mutations.js b/kolibri/core/assets/src/state/modules/core/mutations.js
@@ -15,9 +15,6 @@ export default {
   CORE_SET_ERROR(state, error) {
     state.error = error;
   },
-  CORE_BLOCK_CLICKS(state, blocked) {
-    state.blockDoubleClicks = blocked;
-  },
   SET_TOTAL_PROGRESS(state, progress) {
     state.totalProgress = progress;
   },

diff --git a/kolibri/plugins/learn/assets/src/app.js b/kolibri/plugins/learn/assets/src/app.js
@@ -43,7 +43,6 @@ class LearnModule extends KolibriApp {
 
     // after every navigation, block double-clicks
     router.afterEach((toRoute, fromRoute) => {
-      this.store.dispatch('blockDoubleClicks');
       this.store.dispatch('resetModuleState', { toRoute, fromRoute });
     });
     super.ready();

diff --git a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
@@ -5,8 +5,6 @@
     class="main-wrapper"
   >
 
-    <div v-if="blockDoubleClicks" class="click-mask"></div>
-
     <SkipNavigationLink />
     <LearningActivityBar
       ref="activityBar"
@@ -381,7 +379,6 @@
     computed: {
       ...mapState({
         error: state => state.core.error,
-        blockDoubleClicks: state => state.core.blockDoubleClicks,
       }),
       isCoachContent() {
         return this.content && this.content.coach_content ? 1 : 0;
@@ -735,15 +732,6 @@
     outline-style: none !important;
   }
 
-  .click-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 24;
-    width: 100%;
-    height: 100%;
-  }
-
   .loader {
     position: fixed;
     right: 0;

diff --git a/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue b/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue
@@ -6,8 +6,6 @@
     :style="mainWrapperStyles"
   >
 
-    <div v-if="blockDoubleClicks" class="click-mask"></div>
-
     <div
       v-if="!loading"
       class="scrolling-pane"
@@ -89,7 +87,6 @@
       ...mapState({
         error: state => state.core.error,
         loading: state => state.core.loading,
-        blockDoubleClicks: state => state.core.blockDoubleClicks,
       }),
       isAuthorized() {
         return !(
@@ -168,15 +165,6 @@
     overflow-x: auto;
   }
 
-  .click-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 24;
-    width: 100%;
-    height: 100%;
-  }
-
   .debug {
     font-family: monospace;
     font-size: large;