added search and origin check on popstate navigation check

Author: jonasjabari

app/concepts/matestack/ui/core/app/app.js

@@ -9,12 +9,18 @@ const componentDef = {
   },
   computed: Vuex.mapState({
     asyncTemplate: state => state.pageTemplate,
-    currentPath: state => state.currentPath
+    currentPathName: state => state.currentPathName,
+    currentSearch: state => state.currentSearch,
+    currentOrigin: state => state.currentOrigin,
   }),
   mounted: function(){
     const self = this;
     window.onpopstate = (event) => {
-      if (self.currentPath != document.location.pathname){
+      let needToNavigate = self.currentPathName !== document.location.pathname ||
+        self.currentOrigin !== document.location.origin ||
+        self.currentSearch !== document.location.search
+
+      if (needToNavigate){
         self.$store.dispatch("navigateTo", {url: document.location.pathname, backwards: true} );
       }
     }

app/concepts/matestack/ui/core/app/store.js

@@ -8,14 +8,18 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   state: {
     pageTemplate: null,
-    currentPath: document.location.pathname
+    currentPathName: document.location.pathname,
+    currentSearch: document.location.search,
+    currentOrigin: document.location.origin
   },
   mutations: {
     setPageTemplate (state, serverResponse){
       state.pageTemplate = serverResponse
     },
-    setCurrentPath (state, path){
-      state.currentPath = path
+    setCurrentLocation (state, current){
+      state.currentPathName = current.path
+      state.currentSearch = current.search
+      state.currentOrigin = current.origin
     }
   },
   actions: {
@@ -46,7 +50,7 @@ const store = new Vuex.Store({
           setTimeout(function () {
             resolve(response["data"])
             commit('setPageTemplate', response["data"])
-            commit('setCurrentPath', url)
+            commit('setCurrentLocation', { path: url, search: document.location.search, origin: document.location.origin })
             matestackEventHub.$emit("page_loaded", url);
             if (typeof matestackUiCoreTransitionSuccess !== 'undefined') {
               matestackUiCoreTransitionSuccess(url);