Permalink
Browse files

Bump version

  • Loading branch information...
fralud committed May 10, 2017
1 parent 48df831 commit 28bdcd7f6e098e5b85f16045467a063774c0bf38
View
@@ -41,6 +41,6 @@ CDN
---
::
- <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.6/galleria.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.7/galleria.min.js"></script>
https://cdnjs.com/libraries/galleria
View
@@ -1,5 +1,5 @@
/**
- * Galleria v1.5.6 2017-04-08
+ * Galleria v1.5.7 2017-05-10
* http://galleria.io
*
* Copyright (c) 2010 - 2016 worse is better UG
@@ -21,7 +21,7 @@ var doc = window.document,
protoArray = Array.prototype,
// internal constants
- VERSION = 1.56,
+ VERSION = 1.57,
DEBUG = true,
TIMEOUT = 30000,
DUMMY = false,
@@ -31,6 +31,10 @@ var doc = window.document,
M = Math,
F = function(){},
FALSE = function() { return false; },
+ MOBILE = !(
+ ( window.screen.width > 1279 && window.devicePixelRatio == 1 ) || // there are not so many mobile devices with more than 1280px and pixelRatio equal to 1 (i.e. retina displays are equal to 2...)
+ ( window.screen.width > 1000 && window.innerWidth < (window.screen.width * .9) ) // this checks in the end if a user is using a resized browser window which is not common on mobile devices
+ ),
IE = (function() {
var v = 3,
@@ -1088,17 +1092,17 @@ $.event.special['click:fast'] = {
}).on('touchstart.fast', function(e) {
window.clearTimeout($(this).data('timer'));
$(this).data('clickstate', {
- touched: true,
+ touched: true,
touchdown: true,
coords: getCoords(e.originalEvent),
evObj: e
});
}).on('touchmove.fast', function(e) {
var coords = getCoords(e.originalEvent),
state = $(this).data('clickstate'),
- distance = Math.max(
- Math.abs(state.coords.x - coords.x),
- Math.abs(state.coords.y - coords.y)
+ distance = Math.max(
+ Math.abs(state.coords.x - coords.x),
+ Math.abs(state.coords.y - coords.y)
);
if ( distance > 6 ) {
$(this).data('clickstate', $.extend(state, {
@@ -2758,7 +2762,7 @@ Galleria.prototype = {
// legacy patch
if( s === false || s == 'disabled' ) { return false; }
-
+
return !!Galleria.TOUCH;
}( options.swipe ));
@@ -3566,12 +3570,14 @@ Galleria.prototype = {
}
},
thumbload = $( thumb.container ).data( 'thumbload' );
- if ( thumb.video ) {
- thumbload.call( self, thumb, callback );
- } else {
- thumb.load( data.src , function( thumb ) {
- thumbload.call( self, thumb, callback );
- });
+ if (thumbload) {
+ if ( thumb.video ) {
+ thumbload.call( self, thumb, callback );
+ } else {
+ thumb.load( data.src , function( thumb ) {
+ thumbload.call( self, thumb, callback );
+ });
+ }
}
});
@@ -4023,7 +4029,7 @@ Galleria.prototype = {
this.clearTimer();
Utils.removeFromArray( _instances, this );
Utils.removeFromArray( _galleries, this );
- if ( Galleria._waiters.length ) {
+ if ( Galleria._waiters !== undefined && Galleria._waiters.length ) {
$.each( Galleria._waiters, function( i, w ) {
if ( w ) window.clearTimeout( w );
});
@@ -5655,7 +5661,7 @@ $.extend( Galleria, {
IPHONE: /iphone/.test( NAV ),
IPAD: /ipad/.test( NAV ),
ANDROID: /android/.test( NAV ),
- TOUCH: ('ontouchstart' in doc)
+ TOUCH: ( 'ontouchstart' in doc ) && MOBILE // rule out false positives on Win10
});
View

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,5 +1,5 @@
/**
- * Galleria - v1.5.6 2017-04-08
+ * Galleria - v1.5.7 2017-05-10
* https://galleria.io
*
* Copyright (c) 2010 - 2017 worse is better UG

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -114,8 +114,8 @@ <h1>Galleria Classic Theme</h1>
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.js"></script> -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.js"></script>
<!-- load Galleria -->
- <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.6/galleria.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.6/themes/classic/galleria.classic.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.7/galleria.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.7/themes/classic/galleria.classic.min.js"></script>
<script>
$(function() {
Galleria.run('#galleria');

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -14,7 +14,7 @@
Galleria.addTheme({
name: 'fullscreen',
- version: 1.5,
+ version: '1.5.4',
author: 'Galleria',
css: 'galleria.fullscreen.css',
// begin site script
View
@@ -1,6 +1,6 @@
{
"name": "galleria",
- "version": "1.5.6",
+ "version": "1.5.7",
"title": "Responsive JavaScript Image Gallery",
"description": "A free JavaScript image gallery framework that simplifies the process of creating beautiful image galleries for the web and mobile devices.",
"homepage": "https://galleria.io",
View
@@ -1,5 +1,5 @@
/**
- * Galleria v1.5.6 2017-04-08
+ * Galleria v1.5.7 2017-05-10
* http://galleria.io
*
* Copyright (c) 2010 - 2016 worse is better UG
@@ -21,7 +21,7 @@ var doc = window.document,
protoArray = Array.prototype,
// internal constants
- VERSION = 1.56,
+ VERSION = 1.57,
DEBUG = true,
TIMEOUT = 30000,
DUMMY = false,
@@ -114,8 +114,8 @@ <h1>Galleria Classic Theme</h1>
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.js"></script> -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.js"></script>
<!-- load Galleria -->
- <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.6/galleria.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.6/themes/classic/galleria.classic.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.7/galleria.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/galleria/1.5.7/themes/classic/galleria.classic.min.js"></script>
<script>
$(function() {
Galleria.run('#galleria');

0 comments on commit 28bdcd7

Please sign in to comment.