Merge pull request #15 from dteoh/14-integration-fixes

Integration script updates

Author: dteoh

devdocs-macos/DocumentationViewController.swift

@@ -195,6 +195,10 @@ class DocumentationViewController: NSViewController {
         self.documentURL = URL(string: location)
         hideSearchControl()
     }
+
+    private func handleAppReboot() {
+        webView.reload()
+    }
 }
 
 // MARK:- WKUIDelegate
@@ -256,6 +260,8 @@ extension DocumentationViewController: WKScriptMessageHandler {
                 return
             }
             handleLocationNotification(args)
+        case "appReboot":
+            handleAppReboot()
         default:
             return
         }

devdocs-macos/user-scripts/integration.js

@@ -1,18 +1,33 @@
-(function () {
+(async function () {
   // Need to patch app.views.Mobile.detect internals to force desktop mode.
   const original = window.matchMedia
   const patcher = function () {
     return { matches: false }
   }
   window.matchMedia = patcher
 
-  const afterInit = function () {
-    if (window.app && window.app.settings) {
-      window.matchMedia = original
-      window.webkit.messageHandlers.vcBus.postMessage({ type: 'afterInit' })
-    } else {
-      requestAnimationFrame(afterInit)
-    }
+  const globalDefined = (attr) => {
+    return new Promise(function (resolve, reject) {
+      const checker = () => {
+        if (Object.prototype.hasOwnProperty.call(window, attr)) {
+          resolve(window[attr])
+        } else {
+          requestAnimationFrame(checker)
+        }
+      }
+      requestAnimationFrame(checker)
+    })
   }
-  requestAnimationFrame(afterInit)
+
+  const app = await globalDefined('app')
+  app.isMobile = () => false
+  app.views.Mobile.detect = () => false
+  app.reboot = () => {
+    window.webkit.messageHandlers.vcBus.postMessage({
+      type: 'appReboot'
+    })
+  }
+
+  window.matchMedia = original
+  window.webkit.messageHandlers.vcBus.postMessage({ type: 'afterInit' })
 }())