Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade jquery, jquery.fitvids #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade jquery, jquery.fitvids #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3343119
Upgrade to latest jquery 3.4.1
kiesel May 8, 2019
1f6c4db
Upgrade jquery.fitvids to 1.2.0
kiesel May 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions assets/js/libs/jquery-1.11.3.min.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions assets/js/libs/jquery-3.4.1.min.js
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 19 additions & 15 deletions assets/js/libs/jquery.fitvids.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/*global jQuery */
/*jshint browser:true */
/*!
* FitVids 1.1
Expand All @@ -9,9 +8,9 @@
*
*/

(function( $ ){
;(function( $ ){

"use strict";
'use strict';

$.fn.fitVids = function( options ) {
var settings = {
Expand All @@ -23,7 +22,7 @@
// appendStyles: https://github.com/toddmotto/fluidvids/blob/master/dist/fluidvids.js
var head = document.head || document.getElementsByTagName('head')[0];
var css = '.fluid-width-video-wrapper{width:100%;position:relative;padding:0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position:absolute;top:0;left:0;width:100%;height:100%;}';
var div = document.createElement('div');
var div = document.createElement("div");
div.innerHTML = '<p>x</p><style id="fit-vids-style">' + css + '</style>';
head.appendChild(div.childNodes[1]);
}
Expand All @@ -34,12 +33,12 @@

return this.each(function(){
var selectors = [
"iframe[src*='player.vimeo.com']",
"iframe[src*='youtube.com']",
"iframe[src*='youtube-nocookie.com']",
"iframe[src*='kickstarter.com'][src*='video.html']",
"object",
"embed"
'iframe[src*="player.vimeo.com"]',
'iframe[src*="youtube.com"]',
'iframe[src*="youtube-nocookie.com"]',
'iframe[src*="kickstarter.com"][src*="video.html"]',
'object',
'embed'
];

if (settings.customSelector) {
Expand All @@ -53,7 +52,7 @@
}

var $allVideos = $(this).find(selectors.join(','));
$allVideos = $allVideos.not("object object"); // SwfObj conflict patch
$allVideos = $allVideos.not('object object'); // SwfObj conflict patch
$allVideos = $allVideos.not(ignoreList); // Disable FitVids on this video.

$allVideos.each(function(){
Expand All @@ -70,14 +69,19 @@
var height = ( this.tagName.toLowerCase() === 'object' || ($this.attr('height') && !isNaN(parseInt($this.attr('height'), 10))) ) ? parseInt($this.attr('height'), 10) : $this.height(),
width = !isNaN(parseInt($this.attr('width'), 10)) ? parseInt($this.attr('width'), 10) : $this.width(),
aspectRatio = height / width;
if(!$this.attr('id')){
var videoID = 'fitvid' + Math.floor(Math.random()*999999);
$this.attr('id', videoID);
if(!$this.attr('name')){
var videoName = 'fitvid' + $.fn.fitVids._count;
$this.attr('name', videoName);
$.fn.fitVids._count++;
}
$this.wrap('<div class="fluid-width-video-wrapper"></div>').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+"%");
$this.wrap('<div class="fluid-width-video-wrapper"></div>').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+'%');
$this.removeAttr('height').removeAttr('width');
});
});
};

// Internal counter for unique video names.
$.fn.fitVids._count = 0;

// Works with either jQuery or Zepto
})( window.jQuery || window.Zepto );
2 changes: 1 addition & 1 deletion layouts/_default/baseof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</section>

{{ $highlight := resources.Get "js/libs/highlight.pack.js" }}
{{ $jquery := resources.Get "js/libs/jquery-1.11.3.min.js" }}
{{ $jquery := resources.Get "js/libs/jquery-3.4.1.min.js" }}
{{ $fitVids := resources.Get "js/libs/jquery.fitvids.js" }}
{{ $history := resources.Get "js/libs/jquery.history.js" }}
{{ $nProgress := resources.Get "js/libs/nprogress.js" }}
Expand Down