Permalink
Browse files

1.3.6

  • Loading branch information...
1 parent d656044 commit 618f5150285aa1d80054f093fe59ecb260f38349 @davidhellsing davidhellsing committed Jun 24, 2014
Showing with 6 additions and 6 deletions.
  1. +2 −2 src/galleria.js
  2. +4 −4 src/plugins/flickr/galleria.flickr.js
View
@@ -2984,8 +2984,8 @@ Galleria.prototype = {
return;
}
- self.$( 'images' ).find( 'iframe' ).remove();
- self.$( 'images' ).find( '.galleria-frame' ).css('opacity', 0).hide();
+ // remove video iframes
+ self.$( 'images' ).find( '.galleria-frame' ).css('opacity', 0).hide().find( 'iframe' ).remove();
if ( self._options.carousel && self._options.carouselFollow ) {
self._carousel.follow( index );
@@ -23,7 +23,7 @@ var PATH = Galleria.utils.getScriptPath();
@example var flickr = new Galleria.Flickr();
- @author http://aino.se
+ @author http://galleria.io
@requires jQuery
@requires Galleria
@@ -190,7 +190,7 @@ Galleria.Flickr.prototype = {
_call: function( params, callback ) {
- var url = 'http://api.flickr.com/services/rest/?';
+ var url = 'https://api.flickr.com/services/rest/?';
var scope = this;
@@ -223,7 +223,7 @@ Galleria.Flickr.prototype = {
return photo.url_l;
} else if ( parseInt( photo.width_o, 10 ) > 1280 ) {
- return 'http://farm'+photo.farm + '.static.flickr.com/'+photo.server +
+ return 'https://farm'+photo.farm + '.static.flickr.com/'+photo.server +
'/' + photo.id + '_' + photo.secret + '_b.jpg';
}
@@ -293,7 +293,7 @@ Galleria.Flickr.prototype = {
big: this._getBig( photo ),
title: photos[i].title,
description: this.options.description && photos[i].description ? photos[i].description._content : '',
- link: this.options.backlink ? 'http://flickr.com/photos/' + photo.owner + '/' + photo.id : ''
+ link: this.options.backlink ? 'https://flickr.com/photos/' + photo.owner + '/' + photo.id : ''
});
}
callback.call( this, gallery );

0 comments on commit 618f515

Please sign in to comment.