This repository has been archived by the owner on Oct 16, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1573 from woothemes/release-2-6-2
Release 2 6 2
- Loading branch information
Showing
9 changed files
with
106 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "flexslider", | ||
| "version": "2.6.1", | ||
| "version": "2.6.2", | ||
| "homepage": "https://github.com/woothemes/FlexSlider", | ||
| "authors": [ | ||
| "WooThemes <[email protected]>" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,84 @@ | ||
| /*global jQuery */ | ||
| /*! | ||
| * FitVids 1.0 | ||
| /*jshint browser:true */ | ||
| /*! | ||
| * FitVids 1.1 | ||
| * | ||
| * Copyright 2011, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com | ||
| * Copyright 2013, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com | ||
| * Credit to Thierry Koblentz - http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/ | ||
| * Released under the WTFPL license - http://sam.zoy.org/wtfpl/ | ||
| * | ||
| * Date: Thu Sept 01 18:00:00 2011 -0500 | ||
| */ | ||
| (function(a){a.fn.fitVids=function(b){var c={customSelector:null},d=document.createElement("div"),e=document.getElementsByTagName("base")[0]||document.getElementsByTagName("script")[0];return d.className="fit-vids-style",d.innerHTML="­<style> .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%; } </style>",e.parentNode.insertBefore(d,e),b&&a.extend(c,b),this.each(function(){var b=["iframe[src^='http://player.vimeo.com']","iframe[src^='http://www.youtube.com']","iframe[src^='https://www.youtube.com']","iframe[src^='http://www.kickstarter.com']","iframe[src^='http://fast.wistia.com']","object","embed"];c.customSelector&&b.push(c.customSelector);var d=a(this).find(b.join(","));d.each(function(){var b=a(this);if(this.tagName.toLowerCase()=="embed"&&b.parent("object").length||b.parent(".fluid-width-video-wrapper").length)return;var c=this.tagName.toLowerCase()=="object"?b.attr("height"):b.height(),d=c/b.width();if(!b.attr("id")){var e="fitvid"+Math.floor(Math.random()*999999);b.attr("id",e)}b.wrap('<div class="fluid-width-video-wrapper"></div>').parent(".fluid-width-video-wrapper").css("padding-top",d*100+"%"),b.removeAttr("height").removeAttr("width")})})}})(jQuery) | ||
|
|
||
| (function( $ ){ | ||
|
|
||
| "use strict"; | ||
|
|
||
| $.fn.fitVids = function( options ) { | ||
| var settings = { | ||
| customSelector: null, | ||
| ignore: null, | ||
| }; | ||
|
|
||
| if(!document.getElementById('fit-vids-style')) { | ||
| // 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'); | ||
| div.innerHTML = '<p>x</p><style id="fit-vids-style">' + css + '</style>'; | ||
| head.appendChild(div.childNodes[1]); | ||
| } | ||
|
|
||
| if ( options ) { | ||
| $.extend( settings, options ); | ||
| } | ||
|
|
||
| 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']", | ||
| "iframe[src^='http://fast.wistia.com']", | ||
| "object", | ||
| "embed" | ||
| ]; | ||
|
|
||
| if (settings.customSelector) { | ||
| selectors.push(settings.customSelector); | ||
| } | ||
|
|
||
| var ignoreList = '.fitvidsignore'; | ||
|
|
||
| if(settings.ignore) { | ||
| ignoreList = ignoreList + ', ' + settings.ignore; | ||
| } | ||
|
|
||
| var $allVideos = $(this).find(selectors.join(',')); | ||
| $allVideos = $allVideos.not("object object"); // SwfObj conflict patch | ||
| $allVideos = $allVideos.not(ignoreList); // Disable FitVids on this video. | ||
|
|
||
| $allVideos.each(function(){ | ||
| var $this = $(this); | ||
| if($this.parents(ignoreList).length > 0) { | ||
| return; // Disable FitVids on this video. | ||
| } | ||
| if (this.tagName.toLowerCase() === 'embed' && $this.parent('object').length || $this.parent('.fluid-width-video-wrapper').length) { return; } | ||
| if ((!$this.css('height') && !$this.css('width')) && (isNaN($this.attr('height')) || isNaN($this.attr('width')))) | ||
| { | ||
| $this.attr('height', 9); | ||
| $this.attr('width', 16); | ||
| } | ||
| 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); | ||
| } | ||
| $this.wrap('<div class="fluid-width-video-wrapper"></div>').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+"%"); | ||
| $this.removeAttr('height').removeAttr('width'); | ||
| }); | ||
| }); | ||
| }; | ||
| // Works with either jQuery or Zepto | ||
| })( window.jQuery || window.Zepto ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters