Merge pull request #80 from oslabs-beta/staging

Staging

Author: crperezt

MyMovie.gif

@@ -244,6 +244,7 @@ chrome.runtime.onMessage.addListener((request, sender) => {
           tabsObj[tabId].snapshots.splice(1);
           // gabi :: reset hierarchy to page initial state
           if (tabsObj[tabId].hierarchy) {
+            //test
             tabsObj[tabId].hierarchy.children = [];
             // gabi :: reset currParent plus current state
             tabsObj[tabId].currParent = 1;
@@ -278,26 +279,6 @@ chrome.runtime.onMessage.addListener((request, sender) => {
         firstSnapshotReceived[tabId] = true;
         reloaded[tabId] = false;
 
-        // if (tabsObj[tabId].snapshots[tabsObj[tabId].snapshots.length - 1]) {
-        //   let sameState = true;
-        //   const testState = (array, compare) => {
-        //     array.forEach((element, elIndex) => {
-        //       const test1 = JSON.stringify(element.state);
-        //       const test2 = JSON.stringify(compare[elIndex].state);
-        //       if (JSON.stringify(element.state) !== JSON.stringify(compare[elIndex].state)) {
-        //         sameState = false;
-        //       }
-        //       if (element.children) {
-        //         testState(element.children, compare[elIndex].children);
-        //       }
-        //     });
-        //   };
-        //   testState(tabsObj[tabId].snapshots[tabsObj[tabId].snapshots.length - 1].children, request.payload.children);
-        //   if (sameState) {
-        //     break;
-        //   }
-        // }
-
         tabsObj[tabId].snapshots.push(request.payload);
 
         sendToHierarchy(
@@ -362,6 +343,49 @@ chrome.tabs.onRemoved.addListener(tabId => {
   delete firstSnapshotReceived[tabId];
 });
 
+// when a new url is loaded on the same tab, this remove the tabid from the tabsObj, recreate the tab and inject the script 
+chrome.tabs.onUpdated.addListener((tabId, changeInfo) => {
+
+  // check if the tab title changed to see if tab need to restart
+  if (changeInfo && tabsObj[tabId]){
+    if(changeInfo.title && changeInfo.title !== tabsObj[tabId].title){
+
+      // tell devtools which tab to delete
+      if (portsArr.length > 0) {
+        portsArr.forEach(bg =>
+          bg.postMessage({
+            action: 'deleteTab',
+            payload: tabId,
+          }),
+        );
+      }
+
+      // delete the tab from the tabsObj
+      delete tabsObj[tabId];
+      delete reloaded[tabId];
+      delete firstSnapshotReceived[tabId];
+
+      // recreate the tab on the tabsObj
+      tabsObj[tabId] = createTabObj(changeInfo.title);
+
+      // reinject the script to the tab
+      chrome.tabs.executeScript(tabId, {
+        code: `
+        // Function will attach script to the dom 
+        const injectScript = (file, tag) => {
+          const htmlBody = document.getElementsByTagName(tag)[0];
+          const script = document.createElement('script');
+          script.setAttribute('type', 'text/javascript');
+          script.setAttribute('src', file);
+          htmlBody.appendChild(script);
+        };
+        injectScript(chrome.runtime.getURL('bundles/backend.bundle.js'), 'body');
+      `,
+      });
+    }
+  }
+});
+
 // when tab is view change, put the tabid as the current tab
 chrome.tabs.onActivated.addListener(info => {
   // tell devtools which tab to be the current

ShortMovie.gif

@@ -9,7 +9,10 @@ window.addEventListener('message', msg => { // runs automatically every second
   // messages sent by contentscrip
   if (firstMessage) {
     // tell the background script that the tab has reloaded
-    chrome.runtime.sendMessage({ action: 'tabReload' });
+    chrome.runtime.sendMessage({
+      action: 'tabReload', 
+      payload: msg
+    });
     firstMessage = false;
   }