From d99b7753d6b2d8e6a27b3d84057ca3d6ebdd86eb Mon Sep 17 00:00:00 2001
From: Jonas <Snuffleupagus@server.fake>
Date: Sat, 20 Jul 2013 16:33:40 +0200
Subject: [PATCH] Check if viewer is embedded only once and cache the result

---
 web/pdf_history.js | 4 ++--
 web/viewer.js      | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/pdf_history.js b/web/pdf_history.js
index ee00c6b3b..51c5cd9bd 100644
--- a/web/pdf_history.js
+++ b/web/pdf_history.js
@@ -23,9 +23,9 @@ var PDFHistory = {
   initialDestination: null,
 
   initialize: function pdfHistoryInitialize(fingerprint) {
-    if (PDFJS.disableHistory || window.parent !== window) {
+    if (PDFJS.disableHistory || PDFView.isViewerEmbedded) {
       // The browsing history is only enabled when the viewer is standalone,
-      // i.e. not when it is embedded in a page.
+      // i.e. not when it is embedded in a web page.
       return;
     }
     this.initialized = true;
diff --git a/web/viewer.js b/web/viewer.js
index aa09f3cbc..4c090f1d6 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -191,6 +191,7 @@ var PDFView = {
   mouseScrollDelta: 0,
   lastScroll: 0,
   previousPageNumber: 1,
+  isViewerEmbedded: (window.parent !== window),
 
   // called once when the document is loaded
   initialize: function pdfViewInitialize() {
@@ -947,11 +948,11 @@ var PDFView = {
       self.setInitialView(storedHash, scale);
 
       // Make all navigation keys work on document load,
-      // unless the viewer is embedded in another page.
-      if (window.parent === window) {
-        PDFView.container.focus();
+      // unless the viewer is embedded in a web page.
+      if (!self.isViewerEmbedded) {
+        self.container.focus();
 //#if (FIREFOX || MOZCENTRAL)
-//      PDFView.container.blur();
+//      self.container.blur();
 //#endif
       }
     });