Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SCRUM-8311:"fixed default anchor issue" #368

Closed
wants to merge 14 commits into from
Closed

SCRUM-8311:"fixed default anchor issue" #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e5114e8
slowing down settimeout for fast click
Oct 21, 2015
471de0f
bower config setup
Oct 21, 2015
a400308
version name update
Oct 21, 2015
490737c
v1.4.3
Oct 21, 2015
1910e53
file change
Oct 21, 2015
6a061fa
bower json update
Oct 21, 2015
8fcee58
main removed
Oct 21, 2015
1b4bfc5
main files update start
Oct 21, 2015
42bcc3e
syntax error fix
Oct 21, 2015
72ae925
main paths fixed in bower json
Oct 21, 2015
376b494
main file change for testing.
Oct 21, 2015
90ab84f
cleared main file again
Oct 21, 2015
279d3e7
SCRUM-8311: Fixed comments anchor issue when gallery is embeded in ar…
Mar 22, 2016
2368a1f
SCRUM-8311: Fixed comments anchor issue when gallery is embeded in ar…
Mar 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "arm-galleria",
"homepage": "https://github.com/apnarm/galleria",
"description": "arm modifications on galleria 1.4.2",
"main": [],
"moduleType": [],
"keywords": [
"galleria"
],
"license": "MIT",
"ignore": [
"node_modules",
"bower_components",
"test",
"tests"
],
"version": "1.4.3"
}
15 changes: 7 additions & 8 deletions src/galleria.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/**
* Galleria v 1.4.2 2014-08-07
* Galleria v 1.4.3 21-10-2015
* http://galleria.io
*
* Licensed under the MIT license
* https://raw.github.com/aino/galleria/master/LICENSE
*
*/

(function( $, window, Galleria, undef ) {
Expand Down Expand Up @@ -1088,17 +1087,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, {
Expand All @@ -1113,7 +1112,7 @@ $.event.special['click:fast'] = {
}
$this.data('timer', window.setTimeout(function() {
$this.data('clickstate', def);
}, 400));
}, 500));
}).on('click.fast', function(e) {
var state = $(this).data('clickstate');
if ( state.touched ) {
Expand Down Expand Up @@ -2758,7 +2757,7 @@ Galleria.prototype = {

// legacy patch
if( s === false || s == 'disabled' ) { return false; }

return !!Galleria.TOUCH;

}( options.swipe ));
Expand Down
5 changes: 2 additions & 3 deletions src/plugins/history/galleria.history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Galleria.History = (function() {
get = function( winloc ) {
if( iframe && !support && Galleria.IE ) {
winloc = winloc || iframe.location;
} else {
winloc = loc;
} else {
iframe.location;
}
return parseInt( winloc.hash.substr(2), 10 );
},
Expand Down Expand Up @@ -143,4 +143,3 @@ Galleria.History = (function() {
}());

}( jQuery, this ));