Skip to content

Commit

Permalink
27.3.0
Browse files Browse the repository at this point in the history
fix layer render while dragging on ios, mac
update example slider-with-fixed-static-element.html
  • Loading branch information
jssor committed Jul 14, 2018
1 parent e24a778 commit eaf6be4
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 34 deletions.
38 changes: 21 additions & 17 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
MIT License
The MIT License (MIT)

Copyright (c) 2018 Jssor
Copyright (c) 2018 Jssor Foundation
https://www.jssor.com/

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

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

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


THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"url": "https://github.com/jssor/slider.git"
},
"description": "touch swipe image slider/slideshow/gallery/carousel/banner mobile responsive bootstrap",
"version": "27.2.0",
"version": "27.3.0",
"homepage": "https://www.jssor.com",
"keywords": [
"javascript",
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "jssor-slider",
"repo": "jssor/slider",
"description": "touch swipe image slider/slideshow/gallery/carousel/banner mobile responsive bootstrap",
"version": "27.2.0",
"version": "27.3.0",
"homepage": "https://www.jssor.com",
"keywords": [
"javascript",
Expand Down
11 changes: 5 additions & 6 deletions examples-jquery/slider-with-fixed-static-element.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,12 @@
<div><img data-u="image" src="../img/gallery/980x380/006.jpg" /></div>
<div><img data-u="image" src="../img/gallery/980x380/007.jpg" /></div>
<div><img data-u="image" src="../img/gallery/980x380/008.jpg" /></div>

<!-- 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 -->
<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;">
<!-- 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. -->
<!-- reference: Hhttp://www.jssor.com/development/slider-with-fixed-static-element.html -->
</div>
</div>
<!-- every element outside slides container is fixed/static element. -->
<!-- reference: http://www.jssor.com/development/slider-with-fixed-static-element.html -->
<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;">
</div>
<img src="../img/qr/jssor.com.png" style="position: absolute;bottom:8px;right:8px;width:80px;height:80px;opacity:.6;" />
</div>
<!-- Jssor Slider End -->
</body>
Expand Down
11 changes: 5 additions & 6 deletions examples/slider-with-fixed-static-element.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,12 @@
<div><img data-u="image" src="../img/gallery/980x380/006.jpg" /></div>
<div><img data-u="image" src="../img/gallery/980x380/007.jpg" /></div>
<div><img data-u="image" src="../img/gallery/980x380/008.jpg" /></div>

<!-- 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 -->
<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;">
<!-- 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. -->
<!-- reference: Hhttp://www.jssor.com/development/slider-with-fixed-static-element.html -->
</div>
</div>
<!-- every element outside slides container is fixed/static element. -->
<!-- reference: http://www.jssor.com/development/slider-with-fixed-static-element.html -->
<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;">
</div>
<img src="../img/qr/jssor.com.png" style="position: absolute;bottom:8px;right:8px;width:80px;height:80px;opacity:.6;" />

<!-- Trigger -->
<script>
Expand Down
Binary file added img/qr/jssor.com.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion js/jssor.slider.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jssor-slider",
"version": "27.2.0",
"version": "27.3.0",
"description": "touch swipe image slider/slideshow/gallery/carousel/banner mobile responsive bootstrap",
"main": "js/jssor.slider.min.js",
"homepage": "https://www.jssor.com",
Expand Down
2 changes: 1 addition & 1 deletion transitions/slideshow-transition-builder-controller.min.js

Large diffs are not rendered by default.

0 comments on commit eaf6be4

Please sign in to comment.