Merge pull request #2045 from rtibbles/you_win_this_time_page_state

Revert massive regression, fix issue more safely.
learningequality · Aug 29, 2017 · 035594b · 035594b
2 parents 6e19d87 + 20ff2d0
commit 035594b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/kolibri/plugins/learn/assets/src/state/actions.js b/kolibri/plugins/learn/assets/src/state/actions.js
@@ -481,6 +481,7 @@ function showContentUnavailable(store) {
 
 function redirectToChannelSearch(store) {
   store.dispatch('SET_PAGE_NAME', PageNames.SEARCH_ROOT);
+  store.dispatch('SET_PAGE_STATE', {});
   store.dispatch('CORE_SET_PAGE_LOADING', true);
   store.dispatch('CORE_SET_ERROR', null);
   store.dispatch('CORE_SET_TITLE', 'Search');
@@ -501,6 +502,7 @@ function redirectToChannelSearch(store) {
 
 function showSearch(store, channelId, searchTerm) {
   store.dispatch('SET_PAGE_NAME', PageNames.SEARCH);
+  store.dispatch('SET_PAGE_STATE', {});
   store.dispatch('CORE_SET_PAGE_LOADING', true);
   store.dispatch('CORE_SET_ERROR', null);
   store.dispatch('CORE_SET_TITLE', 'Search');

diff --git a/kolibri/plugins/learn/assets/src/state/store.js b/kolibri/plugins/learn/assets/src/state/store.js
@@ -21,8 +21,7 @@ const mutations = {
     state.pageName = name;
   },
   SET_PAGE_STATE(state, pageState) {
-    const oldPageState = state.pageState;
-    state.pageState = Object.assign(oldPageState, pageState);
+    state.pageState = pageState;
   },
   SET_EXAM_LOG(state, examLog) {
     state.examLog = examLog;

diff --git a/kolibri/plugins/media_player/assets/src/views/index.vue b/kolibri/plugins/media_player/assets/src/views/index.vue
@@ -290,7 +290,6 @@
       window.addEventListener('resize', this.throttledResizePlayer);
     },
     beforeDestroy() {
-      this.recordProgress();
       this.$emit('stopTracking');
       window.removeEventListener('resize', this.throttledResizePlayer);
       this.player.dispose();