Skip to content

Commit eaf6be4

Browse files
author
jssor
committed
27.3.0
fix layer render while dragging on ios, mac update example slider-with-fixed-static-element.html
1 parent e24a778 commit eaf6be4

9 files changed

+36
-34
lines changed

‎LICENSE.txt

+21-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
MIT License
1+
The MIT License (MIT)
22

3-
Copyright (c) 2018 Jssor
3+
Copyright (c) 2018 Jssor Foundation
4+
https://www.jssor.com/
45

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
6+
Permission is hereby granted, free of charge, to any person obtaining
7+
a copy of this software and associated documentation files (the
8+
"Software"), to deal in the Software without restriction, including
9+
without limitation the rights to use, copy, modify, merge, publish,
10+
distribute, sublicense, and/or sell copies of the Software, and to
11+
permit persons to whom the Software is furnished to do so, subject to
12+
the following conditions:
1113

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
1414

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
15+
The above copyright notice and this permission notice shall be
16+
included in all copies or substantial portions of the Software.
17+
18+
19+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
20+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
21+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
22+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
23+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
24+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
25+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"url": "https://github.com/jssor/slider.git"
66
},
77
"description": "touch swipe image slider/slideshow/gallery/carousel/banner mobile responsive bootstrap",
8-
"version": "27.2.0",
8+
"version": "27.3.0",
99
"homepage": "https://www.jssor.com",
1010
"keywords": [
1111
"javascript",

‎component.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "jssor-slider",
33
"repo": "jssor/slider",
44
"description": "touch swipe image slider/slideshow/gallery/carousel/banner mobile responsive bootstrap",
5-
"version": "27.2.0",
5+
"version": "27.3.0",
66
"homepage": "https://www.jssor.com",
77
"keywords": [
88
"javascript",

‎examples-jquery/slider-with-fixed-static-element.html

+5-6
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@
4343
<div><img data-u="image" src="../img/gallery/980x380/006.jpg" /></div>
4444
<div><img data-u="image" src="../img/gallery/980x380/007.jpg" /></div>
4545
<div><img data-u="image" src="../img/gallery/980x380/008.jpg" /></div>
46-
47-
<!-- the following element is at the same level of all other slides, it would be a slide element if the 'u="any"' attribute were not specified -->
48-
<div id="myfixedelement" data-u="any" style="position: absolute; top: 50px; left: 50px; width: 100px; height: 26px; background-color: #fff; user-select: none; -ms-user-select: none; -moz-user-select: none;">
49-
<!-- with 'u="any"' attribute specified, this element is no longer treated as slide, it is a fixed element now, it will always stay where it is. -->
50-
<!-- reference: Hhttp://www.jssor.com/development/slider-with-fixed-static-element.html -->
51-
</div>
5246
</div>
47+
<!-- every element outside slides container is fixed/static element. -->
48+
<!-- reference: http://www.jssor.com/development/slider-with-fixed-static-element.html -->
49+
<div id="myfixedelement" style="position: absolute; top: 50px; left: 50px; width: 100px; height: 26px; background-color: #fff; user-select: none; -ms-user-select: none; -moz-user-select: none;">
50+
</div>
51+
<img src="../img/qr/jssor.com.png" style="position: absolute;bottom:8px;right:8px;width:80px;height:80px;opacity:.6;" />
5352
</div>
5453
<!-- Jssor Slider End -->
5554
</body>

‎examples/slider-with-fixed-static-element.html

+5-6
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,12 @@
4242
<div><img data-u="image" src="../img/gallery/980x380/006.jpg" /></div>
4343
<div><img data-u="image" src="../img/gallery/980x380/007.jpg" /></div>
4444
<div><img data-u="image" src="../img/gallery/980x380/008.jpg" /></div>
45-
46-
<!-- the following element is at the same level of all other slides, it would be a slide element if the 'u="any"' attribute were not specified -->
47-
<div id="myfixedelement" data-u="any" style="position: absolute; top: 50px; left: 50px; width: 100px; height: 26px; background-color: #fff; user-select: none; -ms-user-select: none; -moz-user-select: none;">
48-
<!-- with 'u="any"' attribute specified, this element is no longer treated as slide, it is a fixed element now, it will always stay where it is. -->
49-
<!-- reference: Hhttp://www.jssor.com/development/slider-with-fixed-static-element.html -->
50-
</div>
5145
</div>
46+
<!-- every element outside slides container is fixed/static element. -->
47+
<!-- reference: http://www.jssor.com/development/slider-with-fixed-static-element.html -->
48+
<div id="myfixedelement" style="position: absolute; top: 50px; left: 50px; width: 100px; height: 26px; background-color: #fff; user-select: none; -ms-user-select: none; -moz-user-select: none;">
49+
</div>
50+
<img src="../img/qr/jssor.com.png" style="position: absolute;bottom:8px;right:8px;width:80px;height:80px;opacity:.6;" />
5251

5352
<!-- Trigger -->
5453
<script>

‎img/qr/jssor.com.png

1.26 KB
Loading

‎js/jssor.slider.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jssor-slider",
3-
"version": "27.2.0",
3+
"version": "27.3.0",
44
"description": "touch swipe image slider/slideshow/gallery/carousel/banner mobile responsive bootstrap",
55
"main": "js/jssor.slider.min.js",
66
"homepage": "https://www.jssor.com",

‎transitions/slideshow-transition-builder-controller.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)