pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website: snippet gallery in mode slideshow: When selecting an image, the previous one is highlighted when add images. Can't display the first image.

Browse Source
This commit is contained in:
Christophe Matthieu
2015-01-23 12:44:26 +01:00
parent 113e6addad
commit 88c1b40dea
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.snippets.animation.js
+4 -4
View File
@@ -280,7 +280,7 @@
var $prev = $indicator.find('li.fa:first');
var $next = $indicator.find('li.fa:last');
var index = ($lis.filter('.active').index() || 1) -1;
var page = Math.floor((index-1) / 10);
var page = Math.floor(index / 10);
var nb = Math.ceil($lis.length / 10);
// fix bootstrap use index insead of data-slide-to
@@ -296,7 +296,7 @@
function hide () {
$lis.addClass('hidden').each(function (i) {
if (i > page*10 && i < (page+1)*10+1) {
if (i >= page*10 && i < (page+1)*10) {
$(this).removeClass('hidden');
}
});
@@ -306,14 +306,14 @@
$indicator.find('li.fa').on('click', function () {
page = (page + ($(this).hasClass('o_indicators_left')?-1:1)) % nb;
$carousel.carousel(page*10+1);
$carousel.carousel(page*10);
hide();
});
hide();
$carousel.on('slid.bs.carousel', function() {
var index = ($lis.filter('.active').index() || 1) -1;
page = Math.floor((index-1) / 10);
page = Math.floor(index / 10);
hide();
});
}
addons/website/static/src/js/website.snippets.gallery.js
+10
View File
@@ -205,6 +205,16 @@
$(this).attr('data-index', index).data('index', index);
});
this.$target.css("height", Math.round(window.innerHeight*0.7));
// apply layout animation
this.$target.off('slide.bs.carousel').off('slid.bs.carousel');
this.$target.find('li.fa').off('click');
if (this.$target.data("snippet-view", view)) {
var view = new website.snippet.animationRegistry.gallery_slider(this.$target, true);
this.$target.data("snippet-view", view);
} else {
this.$target.data("snippet-view").start(true);
}
},
columns : function(type, value) {
this.$target.attr("data-columns", value);