From 000e40a75e764a51e784c93a0badc264e6bc54f7 Mon Sep 17 00:00:00 2001
From: Josh Bird <joshua.thomas.bird@gmail.com>
Date: Mon, 19 Mar 2018 10:34:25 -0400
Subject: [PATCH 1/8] Update .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1e4ac1d96..e16fc54c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,4 +71,6 @@ player/static/mfr/*
 
 !.gitkeep
 
+node_modules/
+
 .cache

From 135dfdf891c60d778fbdd64255a84edb9e3925e1 Mon Sep 17 00:00:00 2001
From: Josh Bird <joshua.thomas.bird@gmail.com>
Date: Mon, 19 Mar 2018 13:30:42 -0400
Subject: [PATCH 2/8] Fix video css, mfr loader

---
 mfr/extensions/video/templates/viewer.mako | 11 ++++++++--
 mfr/server/static/css/mfr.css              | 25 ++++++++++++++++++++++
 mfr/server/static/js/mfr.child.js          | 21 ++++++++++++++++--
 mfr/server/static/js/mfr.js                |  4 ++++
 4 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/mfr/extensions/video/templates/viewer.mako b/mfr/extensions/video/templates/viewer.mako
index e0058e4a4..236d683de 100644
--- a/mfr/extensions/video/templates/viewer.mako
+++ b/mfr/extensions/video/templates/viewer.mako
@@ -1,4 +1,11 @@
-<video controls height="100%">
+<style>
+    body {
+        margin: 0;
+        padding: 0;
+    }
+</style>
+
+<video id="video" controls height="100%">
   <source src="${url}">
   Your browser does not support the video tag.
 </video>
@@ -7,4 +14,4 @@
 <script src="/static/js/mfr.child.js"></script>
 <script>
     window.pymChild.sendMessage('embed', 'embed-responsive-16by9');
-</script>
\ No newline at end of file
+</script>
diff --git a/mfr/server/static/css/mfr.css b/mfr/server/static/css/mfr.css
index 95ab2b4fc..cc77a4488 100644
--- a/mfr/server/static/css/mfr.css
+++ b/mfr/server/static/css/mfr.css
@@ -3,6 +3,11 @@
 This CSS was stripped out of base.css from the osf-style repo.
 */
 
+body {
+    margin: 0;
+    padding: 0;
+}
+
 .ball-pulse > div:nth-child(0) {
   -webkit-animation: scale 0.75s -0.36s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
           animation: scale 0.75s -0.36s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
@@ -35,6 +40,26 @@ This CSS was stripped out of base.css from the osf-style repo.
   background-color: #337AB7;
 }
 
+.ball-scale {
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 250px;
+}
+
+.ball-scale > div {
+}
+
 .embed-responsive-pdf {
     padding-bottom: 95%;
 }
+
+#mfrIframe iframe {
+    display: none;
+}
+
+#mfrIframe {
+    min-height: 250px;
+}
diff --git a/mfr/server/static/js/mfr.child.js b/mfr/server/static/js/mfr.child.js
index 9007692d0..50b4f20af 100644
--- a/mfr/server/static/js/mfr.child.js
+++ b/mfr/server/static/js/mfr.child.js
@@ -2,9 +2,10 @@
     'use strict';
     window.pymChild = new pym.Child();
 
+
     window.addEventListener('load', function () {
         window.pymChild.sendHeight();
-
+        window.pymChild.sendMessage('load', true);
         var anchors = document.getElementsByTagName('a');
         Array.prototype.slice.call(anchors).forEach(function (el) {
             el.addEventListener('click', function (e) {
@@ -16,7 +17,23 @@
                 }
             });
         });
-    });
+
+        var video = document.querySelector('#video');
+        if (video) {
+            var preloader = document.querySelector('.preloader');
+
+            function checkLoad() {
+                if (video.readyState === 4) {
+                    preloader.parentNode.removeChild(preloader);
+                    video.css.opacity = "1.0";
+                } else {
+                    setTimeout(checkLoad, 100);
+                }
+            }
+
+            checkLoad();
+        }
+    }, false);
 
     window.addEventListener('resize', function () {
         window.pymChild.sendHeight();
diff --git a/mfr/server/static/js/mfr.js b/mfr/server/static/js/mfr.js
index 628ac8fa0..410e72ac1 100644
--- a/mfr/server/static/js/mfr.js
+++ b/mfr/server/static/js/mfr.js
@@ -82,7 +82,11 @@
             self.pymParent.el.appendChild(self.spinner);
             $(self.pymParent.iframe).on('load', function () {
                 self.pymParent.el.removeChild(self.spinner);
+                this.style.display = "block"
             });
+            self.pymParent.onMessage('load', function() {
+                self.pymParent.el.removeChild(self.spinner);
+            })
 
             self.pymParent.onMessage('embed', function(message) {
                 _addClass(self.pymParent.el, 'embed-responsive');

From 103fa306427a2937b474685bffa6c32219ee4bd8 Mon Sep 17 00:00:00 2001
From: Josh Bird <joshua.thomas.bird@gmail.com>
Date: Mon, 19 Mar 2018 13:51:53 -0400
Subject: [PATCH 3/8] Dont do the scrollbars fic

---
 mfr/extensions/video/templates/viewer.mako | 6 ------
 mfr/server/static/css/mfr.css              | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/mfr/extensions/video/templates/viewer.mako b/mfr/extensions/video/templates/viewer.mako
index 236d683de..49d5198bd 100644
--- a/mfr/extensions/video/templates/viewer.mako
+++ b/mfr/extensions/video/templates/viewer.mako
@@ -1,9 +1,3 @@
-<style>
-    body {
-        margin: 0;
-        padding: 0;
-    }
-</style>
 
 <video id="video" controls height="100%">
   <source src="${url}">
diff --git a/mfr/server/static/css/mfr.css b/mfr/server/static/css/mfr.css
index cc77a4488..0b2be626b 100644
--- a/mfr/server/static/css/mfr.css
+++ b/mfr/server/static/css/mfr.css
@@ -3,11 +3,6 @@
 This CSS was stripped out of base.css from the osf-style repo.
 */
 
-body {
-    margin: 0;
-    padding: 0;
-}
-
 .ball-pulse > div:nth-child(0) {
   -webkit-animation: scale 0.75s -0.36s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
           animation: scale 0.75s -0.36s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);

From 8ca2172c9f74bbdf239a621c4513a73fdc8abad6 Mon Sep 17 00:00:00 2001
From: Josh Bird <joshua.thomas.bird@gmail.com>
Date: Mon, 19 Mar 2018 14:10:40 -0400
Subject: [PATCH 4/8] Remove dead code

---
 mfr/server/static/js/mfr.child.js | 16 ----------------
 mfr/server/static/js/mfr.js       |  5 +----
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/mfr/server/static/js/mfr.child.js b/mfr/server/static/js/mfr.child.js
index 50b4f20af..1036e1f0f 100644
--- a/mfr/server/static/js/mfr.child.js
+++ b/mfr/server/static/js/mfr.child.js
@@ -17,22 +17,6 @@
                 }
             });
         });
-
-        var video = document.querySelector('#video');
-        if (video) {
-            var preloader = document.querySelector('.preloader');
-
-            function checkLoad() {
-                if (video.readyState === 4) {
-                    preloader.parentNode.removeChild(preloader);
-                    video.css.opacity = "1.0";
-                } else {
-                    setTimeout(checkLoad, 100);
-                }
-            }
-
-            checkLoad();
-        }
     }, false);
 
     window.addEventListener('resize', function () {
diff --git a/mfr/server/static/js/mfr.js b/mfr/server/static/js/mfr.js
index 410e72ac1..7e21f0dd4 100644
--- a/mfr/server/static/js/mfr.js
+++ b/mfr/server/static/js/mfr.js
@@ -80,12 +80,9 @@
             self.pymParent.iframe.setAttribute('sandbox', 'allow-scripts allow-popups allow-same-origin');
 
             self.pymParent.el.appendChild(self.spinner);
-            $(self.pymParent.iframe).on('load', function () {
+            $(self.pymParent.iframe).on('load', function() {
                 self.pymParent.el.removeChild(self.spinner);
                 this.style.display = "block"
-            });
-            self.pymParent.onMessage('load', function() {
-                self.pymParent.el.removeChild(self.spinner);
             })
 
             self.pymParent.onMessage('embed', function(message) {

From b408a66fb5228598fa09a7c0efb6254ba5b9997d Mon Sep 17 00:00:00 2001
From: Josh Bird <joshua.thomas.bird@gmail.com>
Date: Mon, 19 Mar 2018 14:11:54 -0400
Subject: [PATCH 5/8] Remove dead code

---
 mfr/server/static/js/mfr.child.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mfr/server/static/js/mfr.child.js b/mfr/server/static/js/mfr.child.js
index 1036e1f0f..7a3663642 100644
--- a/mfr/server/static/js/mfr.child.js
+++ b/mfr/server/static/js/mfr.child.js
@@ -5,7 +5,6 @@
 
     window.addEventListener('load', function () {
         window.pymChild.sendHeight();
-        window.pymChild.sendMessage('load', true);
         var anchors = document.getElementsByTagName('a');
         Array.prototype.slice.call(anchors).forEach(function (el) {
             el.addEventListener('click', function (e) {

From 431ef985c983eccbde282554f7793f65d901c48d Mon Sep 17 00:00:00 2001
From: Joshua Bird <joshua.thomas.bird@gmail.com>
Date: Mon, 19 Mar 2018 15:38:26 -0400
Subject: [PATCH 6/8] Remove dead id.

---
 mfr/extensions/video/templates/viewer.mako | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mfr/extensions/video/templates/viewer.mako b/mfr/extensions/video/templates/viewer.mako
index 49d5198bd..f16181df5 100644
--- a/mfr/extensions/video/templates/viewer.mako
+++ b/mfr/extensions/video/templates/viewer.mako
@@ -1,5 +1,5 @@
 
-<video id="video" controls height="100%">
+<video controls height="100%">
   <source src="${url}">
   Your browser does not support the video tag.
 </video>

From 8f63b6ce1a08e81ad131ccf40fe9a66c15598430 Mon Sep 17 00:00:00 2001
From: Joshua Bird <joshua.thomas.bird@gmail.com>
Date: Mon, 19 Mar 2018 15:38:57 -0400
Subject: [PATCH 7/8] Remove dead css

---
 mfr/server/static/css/mfr.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mfr/server/static/css/mfr.css b/mfr/server/static/css/mfr.css
index 0b2be626b..04625a06e 100644
--- a/mfr/server/static/css/mfr.css
+++ b/mfr/server/static/css/mfr.css
@@ -44,9 +44,6 @@ This CSS was stripped out of base.css from the osf-style repo.
     height: 250px;
 }
 
-.ball-scale > div {
-}
-
 .embed-responsive-pdf {
     padding-bottom: 95%;
 }

From 23884c299a48f2d2c5bef0e6bad553496eaaadbd Mon Sep 17 00:00:00 2001
From: Josh Bird <joshua.thomas.bird@gmail.com>
Date: Tue, 20 Mar 2018 13:10:12 -0400
Subject: [PATCH 8/8] Dont break opengl stuff

---
 mfr/server/static/css/mfr.css | 4 +++-
 mfr/server/static/js/mfr.js   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mfr/server/static/css/mfr.css b/mfr/server/static/css/mfr.css
index 0b2be626b..9d1669d36 100644
--- a/mfr/server/static/css/mfr.css
+++ b/mfr/server/static/css/mfr.css
@@ -42,6 +42,8 @@ This CSS was stripped out of base.css from the osf-style repo.
     align-items: center;
     width: 100%;
     height: 250px;
+    top: 0;
+    left: 0;
 }
 
 .ball-scale > div {
@@ -52,7 +54,7 @@ This CSS was stripped out of base.css from the osf-style repo.
 }
 
 #mfrIframe iframe {
-    display: none;
+    opacity: 0.0;
 }
 
 #mfrIframe {
diff --git a/mfr/server/static/js/mfr.js b/mfr/server/static/js/mfr.js
index 7e21f0dd4..fd567909a 100644
--- a/mfr/server/static/js/mfr.js
+++ b/mfr/server/static/js/mfr.js
@@ -82,7 +82,7 @@
             self.pymParent.el.appendChild(self.spinner);
             $(self.pymParent.iframe).on('load', function() {
                 self.pymParent.el.removeChild(self.spinner);
-                this.style.display = "block"
+                this.style.opacity = "1.0"
             })
 
             self.pymParent.onMessage('embed', function(message) {