Merge pull request #1059 from chiflix/release

Merge release to develop
chiflix · Oct 18, 2019 · c637056 · c637056
2 parents 79c725b + 6b8578d
commit c637056
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/renderer/components/PlayingView/AdvanceControl.vue b/src/renderer/components/PlayingView/AdvanceControl.vue
@@ -107,7 +107,7 @@ export default {
       setTimeout(() => {
         if (this.currentMousedownComponent !== 'notification-bubble' && val !== '') {
           if (this.lastDragging || (this.currentMousedownComponent === this.$options.name
-              && val === 'the-video-controller')) {
+              && val === 'TheVideoController')) {
             if (this.showAttached) {
               this.anim.playSegments([68, 73], true);
               this.$emit('update:lastDragging', false);

diff --git a/src/renderer/components/PlayingView/SubtitleControl.vue b/src/renderer/components/PlayingView/SubtitleControl.vue
@@ -332,7 +332,7 @@ export default {
         if (this.currentMousedownComponent !== 'notification-bubble' && val !== '') {
           if (this.lastDragging
             || (this.currentMousedownComponent === this.$options.name
-              && val === 'the-video-controller')) {
+              && val === 'TheVideoController')) {
             if (this.showAttached) {
               this.anim.playSegments([79, 85]);
               this.$emit('update:lastDragging', false);

diff --git a/src/renderer/containers/RecentPlaylist.vue b/src/renderer/containers/RecentPlaylist.vue
@@ -341,7 +341,7 @@ export default {
         this.clearMousedown({ componentName: '' });
       } else if (this.backgroundDisplayState) {
         this.$emit('update:playlistcontrol-showattached', false);
-        this.updateMousemoveTarget('the-video-controller');
+        this.updateMousemoveTarget('TheVideoController');
       }
     },
     updatelastPlayedTime(time: number) {

diff --git a/src/renderer/containers/TheProgressBar.vue b/src/renderer/containers/TheProgressBar.vue
@@ -263,7 +263,7 @@ export default {
       this.mousedown = true;
       if (event.target === this.$refs.leftInvisible || event.target === this.$refs.rightInvisible) {
         this.showThumbnail = false;
-        this.$bus.$emit('currentWidget', 'the-video-controller');
+        this.$bus.$emit('currentWidget', 'TheVideoController');
         this.setHoveringToFalse(false);
       }
       if (this.hoveredCurrentTime !== this.duration) {

diff --git a/src/renderer/store/modules/Input.js b/src/renderer/store/modules/Input.js
@@ -3,12 +3,12 @@ import { Input as actionTypes } from '../actionTypes';
 
 const state = {
   mousemoveClientPosition: { x: 0, y: 0 },
-  mousemoveComponentName: 'the-video-controller',
+  mousemoveComponentName: 'TheVideoController',
   pressedMouseButtonNames: [],
-  mousedownComponentName: 'the-video-controller',
-  mouseupComponentName: 'the-video-controller',
+  mousedownComponentName: 'TheVideoController',
+  mouseupComponentName: 'TheVideoController',
   pressedKeyboardCodes: [],
-  wheelComponentName: 'the-video-controller',
+  wheelComponentName: 'TheVideoController',
   wheelTimestamp: 0,
   wheelDirection: '',
 };