Permalink
Browse files

FitVids updated.

  • Loading branch information...
samikeijonen committed Dec 25, 2012
1 parent be446ee commit fba7286ffab66c9cab004c8c02b05ed771355221
Showing with 28 additions and 24 deletions.
  1. +28 −24 js/jquery.fitvids.js
View
@@ -1,5 +1,6 @@
/*global jQuery */
-/*!
+/*jshint multistr:true browser:true */
+/*!
* FitVids 1.0
*
* Copyright 2011, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com
@@ -11,15 +12,17 @@
(function( $ ){
+ "use strict";
+
$.fn.fitVids = function( options ) {
var settings = {
customSelector: null
- }
-
+ };
+
var div = document.createElement('div'),
ref = document.getElementsByTagName('base')[0] || document.getElementsByTagName('script')[0];
-
- div.className = 'fit-vids-style';
+
+ div.className = 'fit-vids-style';
div.innerHTML = '&shy;<style> \
.fluid-width-video-wrapper { \
width: 100%; \
@@ -37,41 +40,42 @@
height: 100%; \
} \
</style>';
-
+
ref.parentNode.insertBefore(div,ref);
-
- if ( options ) {
+
+ if ( options ) {
$.extend( settings, options );
}
-
+
return this.each(function(){
var selectors = [
- "iframe[src^='http://player.vimeo.com']",
- "iframe[src^='http://www.youtube.com']",
- "iframe[src^='http://www.kickstarter.com']",
- "object",
+ "iframe[src*='player.vimeo.com']",
+ "iframe[src*='www.youtube.com']",
+ "iframe[src*='www.youtube-nocookie.com']",
+ "iframe[src*='www.kickstarter.com']",
+ "object",
"embed"
];
-
+
if (settings.customSelector) {
selectors.push(settings.customSelector);
}
-
+
var $allVideos = $(this).find(selectors.join(','));
$allVideos.each(function(){
var $this = $(this);
- if (this.tagName.toLowerCase() == 'embed' && $this.parent('object').length || $this.parent('.fluid-width-video-wrapper').length) { return; }
- var height = this.tagName.toLowerCase() == 'object' ? $this.attr('height') : $this.height(),
- aspectRatio = height / $this.width();
- if(!$this.attr('id')){
- var videoID = 'fitvid' + Math.floor(Math.random()*999999);
- $this.attr('id', videoID);
- }
+ if (this.tagName.toLowerCase() === 'embed' && $this.parent('object').length || $this.parent('.fluid-width-video-wrapper').length) { return; }
+ 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');
});
});
-
- }
+ };
})( jQuery );

0 comments on commit fba7286

Please sign in to comment.