Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
7bb73282
Commit
7bb73282
authored
8 years ago
by
Dominik Hebeler
Browse files
Options
Downloads
Plain Diff
Merge branch '244-beim-tabwechsel-funktioniert-der-lightslider-nicht' into 'development'
Fehler behoben Closes
#244
See merge request
!407
parents
82c50012
1623abc2
No related branches found
Branches containing commit
No related tags found
2 merge requests
!408
Development
,
!407
Fehler behoben
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
public/js/scriptResultPage.js
+5
-4
5 additions, 4 deletions
public/js/scriptResultPage.js
resources/views/layouts/products.blade.php
+2
-2
2 additions, 2 deletions
resources/views/layouts/products.blade.php
with
7 additions
and
6 deletions
public/js/scriptResultPage.js
+
5
−
4
View file @
7bb73282
...
@@ -81,8 +81,8 @@ function popovers() {
...
@@ -81,8 +81,8 @@ function popovers() {
$
(
"
[data-toggle=popover]
"
).
each
(
function
(
e
)
{
$
(
"
[data-toggle=popover]
"
).
each
(
function
(
e
)
{
$
(
this
).
popover
(
"
destroy
"
);
$
(
this
).
popover
(
"
destroy
"
);
$
(
this
).
popover
({
$
(
this
).
popover
({
//html
:
true,
//html
:
true,
//title
:
"<span class='glyphicon glyphicon-cog'></span> Optionen",
//title
:
"<span class='glyphicon glyphicon-cog'></span> Optionen",
content
:
$
(
this
).
parent
().
find
(
"
.content
"
).
html
()
content
:
$
(
this
).
parent
().
find
(
"
.content
"
).
html
()
});
});
});
});
...
@@ -214,7 +214,7 @@ function productWidget() {
...
@@ -214,7 +214,7 @@ function productWidget() {
// device detection
// device detection
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
;
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
;
if
(
isMobile
)
{
if
(
isMobile
)
{
$
(
'
#
lightSlider
'
).
lightSlider
({
$
(
'
.
lightSlider
'
).
lightSlider
({
item
:
5
,
item
:
5
,
loop
:
false
,
loop
:
false
,
slideMove
:
2
,
slideMove
:
2
,
...
@@ -256,7 +256,7 @@ function productWidget() {
...
@@ -256,7 +256,7 @@ function productWidget() {
},
]
},
]
});
});
}
else
{
}
else
{
$
(
'
#
lightSlider
'
).
lightSlider
({
$
(
'
.
lightSlider
'
).
lightSlider
({
item
:
5
,
item
:
5
,
loop
:
false
,
loop
:
false
,
slideMove
:
2
,
slideMove
:
2
,
...
@@ -300,4 +300,5 @@ function productWidget() {
...
@@ -300,4 +300,5 @@ function productWidget() {
},
]
},
]
});
});
}
}
$
(
"
.lightSliderContainer
"
).
removeClass
(
"
hidden
"
);
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
resources/views/layouts/products.blade.php
+
2
−
2
View file @
7bb73282
<div
class=
"row"
>
<div
class=
"row
lightSliderContainer hidden
"
>
<div
class=
"col-sm-1 hidden-xs"
></div>
<div
class=
"col-sm-1 hidden-xs"
></div>
<div
class=
"resultInformation col-xs-12 col-sm-11"
>
<div
class=
"resultInformation col-xs-12 col-sm-11"
>
<span
id=
"mark"
><img
src=
"/img/boosticon.png"
alt=
""
height=
"13"
/><a
href=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
partnershops
")
}}"
target=
"_blank"
>
Partnershops
</a></span>
<span
id=
"mark"
><img
src=
"/img/boosticon.png"
alt=
""
height=
"13"
/><a
href=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
partnershops
")
}}"
target=
"_blank"
>
Partnershops
</a></span>
<ul
id
=
"lightSlider"
>
<ul
class
=
"lightSlider"
>
@foreach($products as $product)
@foreach($products as $product)
<li>
<li>
<div
class=
"product"
>
<div
class=
"product"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment