Skip to content
Snippets Groups Projects
Commit 7bf32fc3 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '238-confidential-issue' into 'development' 

Auf nicht mobilen Endgeräten wurde der Slideeffekt deaktiviert.

Preis wird fett markiert.
Abrufen des Images controls.png deaktiviert
Closes #238

See merge request !397
parents 234e7131 af20ab69
No related branches found
No related tags found
2 merge requests!404Development,!397Auf nicht mobilen Endgeräten wurde der Slideeffekt deaktiviert.
Hide whitespace changes
Inline Side-by-side
public/css/lightslider.css
+ 1
− 1
View file @ 7bf32fc3
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
display: block; display: block;
top: 50%; top: 50%;
height: 32px; height: 32px;
background-image: url('../img/controls.png'); /* background-image: url('../img/controls.png'); */
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
z-index: 99; z-index: 99;
......
public/css/styleResultPage.css
+ 1
− 0
View file @ 7bf32fc3
...@@ -544,6 +544,7 @@ footer a { ...@@ -544,6 +544,7 @@ footer a {
color: #333; color: #333;
text-align: left; text-align: left;
width: 80px; width: 80px;
font-weight: bold;
} }
.product .title { .product .title {
......
public/js/scriptResultPage.js
+ 90
− 41
View file @ 7bf32fc3
...@@ -210,45 +210,94 @@ function fokiChanger() { ...@@ -210,45 +210,94 @@ function fokiChanger() {
})(jQuery); })(jQuery);
function productWidget() { function productWidget() {
$('#lightSlider').lightSlider({ var isMobile = false; //initiate as false
item: 5, // device detection
loop: false, if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(navigator.userAgent.substr(0, 4))) isMobile = true;
slideMove: 2, if (isMobile) {
easing: 'cubic-bezier(0.25, 0, 0.25, 1)', $('#lightSlider').lightSlider({
speed: 600, item: 5,
pager: false, loop: false,
prevHtml: '<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span>', slideMove: 2,
nextHtml: '<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span>', easing: 'cubic-bezier(0.25, 0, 0.25, 1)',
responsive: [{ speed: 600,
breakpoint: 1400, pager: false,
settings: { prevHtml: '<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span>',
item: 4, nextHtml: '<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span>',
slideMove: 2, responsive: [{
} breakpoint: 1400,
}, { settings: {
breakpoint: 1200, item: 4,
settings: { slideMove: 2,
item: 3, }
slideMove: 2, }, {
} breakpoint: 1200,
}, { settings: {
breakpoint: 980, item: 3,
settings: { slideMove: 2,
item: 4, }
slideMove: 2, }, {
} breakpoint: 980,
}, { settings: {
breakpoint: 720, item: 4,
settings: { slideMove: 2,
item: 3, }
slideMove: 1 }, {
} breakpoint: 720,
}, { settings: {
breakpoint: 520, item: 3,
settings: { slideMove: 1
item: 2, }
slideMove: 1, }, {
} breakpoint: 520,
}, ] settings: {
}); item: 2,
slideMove: 1,
}
}, ]
});
} else {
$('#lightSlider').lightSlider({
item: 5,
loop: false,
slideMove: 2,
easing: 'cubic-bezier(0.25, 0, 0.25, 1)',
speed: 600,
pager: false,
enableTouch: false,
enableDrag: false,
prevHtml: '<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span>',
nextHtml: '<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span>',
responsive: [{
breakpoint: 1400,
settings: {
item: 4,
slideMove: 2,
}
}, {
breakpoint: 1200,
settings: {
item: 3,
slideMove: 2,
}
}, {
breakpoint: 980,
settings: {
item: 4,
slideMove: 2,
}
}, {
breakpoint: 720,
settings: {
item: 3,
slideMove: 1
}
}, {
breakpoint: 520,
settings: {
item: 2,
slideMove: 1,
}
}, ]
});
}
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment