1.3.6

hennikul · Jun 24, 2014 · 618f515 · 618f515
1 parent d656044
commit 618f515
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/galleria.js b/src/galleria.js
@@ -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 );

diff --git a/src/plugins/flickr/galleria.flickr.js b/src/plugins/flickr/galleria.flickr.js
@@ -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 );