fcad-core-dragon 2.1.0-beta.2 → 2.1.0-beta.3

package/src/router/index.js

@@ -26,20 +26,23 @@ router.beforeResolve((to, from, next) => {
   const { getWidgetOpen, getPopupIsOpen, getSidebarIsOpen } = appStore
   const noNavigationToMenu = appStore.getSettingsFromStore('no_menu')
 
+  if (to.name == 'module') return next({ name: 'menu' }) //redirect to 404 if trying to access module directly
+
   if (getWidgetOpen) app.config.globalProperties.$bus.$emit('close-widget') //close opened widget
   if (getPopupIsOpen) app.config.globalProperties.$bus.$emit('close-popup') //close the popup
   if (getSidebarIsOpen) app.config.globalProperties.$bus.$emit('close-sidebar') //close the sidebar
 
   if (from.name !== 'module')
     app.config.globalProperties.$bus.$emit('update-route-history', from)
-  app.config.globalProperties.$bus.$emit('update-content', to, from, next)
+
+  app.config.globalProperties.$bus.$emit('update-content', to) //update the content of the current page
   //hidle detector should be stopped in menu
   if (to.name == 'menu') {
-    app.config.globalProperties.$bus.$emit('timer-stop')
+    app.config.globalProperties.$bus.$emit('stop-app-timer')
     app.config.globalProperties.$bus.$emit('stop-idle-detector')
   }
 
-  if (noNavigationToMenu && to.name == 'menu') {
+  if ((noNavigationToMenu && to.name == 'menu') || to.name == 'module') {
     const r = app.config.globalProperties.$helper.getRoutesFromVueRouter() //This return all the routes defined for the module
     let safeRoute = r.meta.children[0] //get the first navigable route from the module routes
 

package/src/components/AppCompPlayBarProgress.vue

@@ -1,82 +0,0 @@
-<!--@ Description: This component is used to display the playbar associate with the videoPlayer
- @ What it does: The component is used to interacted with the videoPlayer via buttons.
- v-media class is used to identified which html elements trigger the playBar to be appear (with focus/click)-->
-<template>
-  <!--------------------------------- PLAY-BAR Progress  -------------------------------------->
-  <div ref="$playbar-timeline" class="pb-timeline">
-    <div ref="$progress-area" class="progress-area">
-      <div
-        id="progress-bar"
-        ref="$progress-bar"
-        draggable="false"
-        tabindex="0"
-        class="v-media pb-progress-bar"
-        role="slider"
-        aria-valuemin="0"
-        :aria-label="mediaA11Y.label"
-        :aria-valuenow="mediaA11Y.valNow"
-        :aria-valuemax="mediaA11Y.valMax"
-        :aria-valuetext="mediaA11Y.valueText"
-        @focus="changeFocusState('progressBar', true)"
-        @blur="changeFocusState('progressBar', false)"
-      >
-        <!--Class progress-animation is apply when we are not using the thumb to change the progression-->
-        <div
-          id="progress-indicator"
-          ref="$progress-indicator"
-          draggable="false"
-          class="progress-indicator"
-          :class="{ 'progress-animation': !progressThumbDown }"
-          :style="{ width: progressBarPercentage + '%' }"
-        >
-          <!--Mousedown validate if the thumb is cliqued (if yes, the mouse is follow to modify the progress)
-             MouseOver/MouseOut deactivate click event on progressBar if the mouse hovered the thumb-->
-          <!-- <div
-            ref="$progress-thumb"
-            draggable="false"
-            class="progress-thumb"
-            style="z-index: 9"
-            @mousedown="
-              savedIsPlaying = isPlaying
-              progressThumbDown = true
-            "
-            @mouseover="progressThumbHover = true"
-            @mouseleave="progressThumbHover = false"
-          ></div> -->
-
-          <div
-            ref="$progress-thumb"
-            draggable="false"
-            class="progress-thumb"
-            style="z-index: 9"
-            @mouseover="progressThumbHover = true"
-            @mouseleave="progressThumbHover = false"
-          ></div>
-        </div>
-      </div>
-      <div
-        v-if="tooTipTimeCode"
-        id="seek-tooltip"
-        ref="$seek-tooltip"
-        aria-hidden="true"
-        class="seek-tooltip"
-      >
-        {{ tooTipTimeCode }}
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import $extendsMedia from '../mixins/$mediaMixins'
-
-export default {
-  mixins: [$extendsMedia],
-  data() {
-    return {
-      tooTipTimeCode: null
-    }
-  },
-  mounted() {}
-}
-</script>