Merge branch 'develop'

os2display · Nov 26, 2018 · db6cee8 · db6cee8
2 parents 55bc181 + c46dadb
commit db6cee8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # itk-os2display/vimeo-bundle CHANGELOG
 
+## 1.0.6
+
+* Fixed issue with iframe ending up without 100% width.
+
 ## 1.0.5
 
 * Fixed try/catch to catch initialization errors as well.

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # itk-os2display/vimeo
-Supplies a slide template for playing vimeo videos.
+Supplies a slide template for playing vimeo videos. This bundle uses Vimeo's js player: https://github.com/vimeo/player.js/
 
 ## Ads and controls
 To avoid ads and video controls, the shared video has to come from a user

diff --git a/Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo.css b/Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo.css
@@ -3,3 +3,13 @@
   width: 100%;
   height: 100%;
 }
+
+.itk-vimeo-iframe-wrapper {
+  width: 100%;
+  height: 100%;
+}
+
+.itk-vimeo-iframe-wrapper > iframe {
+  width: 100%;
+  height: 100%;
+}
diff --git a/Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo.html b/Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo.html
@@ -1,3 +1,3 @@
 <div class="itk-vimeo">
-  <div class="js-itk-vimeo--player-{{ikSlide.uniqueId}}"></div>
+  <div class="itk-vimeo-iframe-wrapper js-itk-vimeo--player-{{ikSlide.uniqueId}}"></div>
 </div>
diff --git a/Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo.js b/Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo.js
@@ -31,10 +31,10 @@ if (!window.slideFunctions['itk-vimeo']) {
         run: function runSlide (slide, region) {
             region.itkLog.info('Running itk-vimeo slide: ' + slide.title);
 
-            var slideElement = $('.slide-' + slide.uniqueId);
-
             // Wait fadeTime before start to account for fade in.
             region.$timeout(function () {
+                var slideElement = $('.slide-' + slide.uniqueId);
+
                 var options = {
                     id: slide.options.id,
                     width: slideElement.width(),
@@ -88,7 +88,7 @@ if (!window.slideFunctions['itk-vimeo']) {
                     });
                 }
                 catch (err) {
-                    region.itkLog.info("Error running vimeo video, continuing");
+                    region.itkLog.info("Error running vimeo video, continuing...");
                     region.$timeout((function (region) {
                         region.nextSlide();
                     })(region), 1000);