Permalink
Browse files

(4.6.3)

  • Loading branch information...
1 parent 4eb8c17 commit 0344b9d95efb69f72d444ab0179c3ee4adea5006 @artpolikarpov committed Dec 31, 2014
Showing with 46 additions and 45 deletions.
  1. +4 −4 Gruntfile.js
  2. +15 −0 HISTORY.md
  3. +1 −1 package.json
  4. +2 −2 src/js/fotorama.js
  5. +15 −34 test/autoplay.html
  6. +2 −2 test/base--dimensions.html
  7. +1 −1 test/fullscreen--44.html
  8. +0 −1 test/fullscreen.html
  9. +1 −0 test/index.html
  10. +4 −0 test/keyboard--2.html
  11. +1 −0 test/thumbnails-2.html
View
@@ -138,19 +138,19 @@ copy: {
files: [
{
src: 'out/fotorama.css',
- dest: '.fotorama-npm/dist/fotorama.css'
+ dest: '.fotorama-npm/fotorama.css'
},
{
src: 'out/fotorama.png',
- dest: '.fotorama-npm/dist/fotorama.png'
+ dest: '.fotorama-npm/fotorama.png'
},
{
src: 'out/fotorama@2x.png',
- dest: '.fotorama-npm/dist/fotorama@2x.png'
+ dest: '.fotorama-npm/fotorama@2x.png'
},
{
src: 'out/fotorama.js',
- dest: '.fotorama-npm/dist/fotorama.js'
+ dest: '.fotorama-npm/fotorama.js'
}
]
}
View
@@ -2,6 +2,21 @@
> https://github.com/artpolikarpov/fotorama/releases
+## 4.6.3, 31 December 2014
+
+<!--4.6.3:name-->
+HPPNWYR
+<!--/4.6.3:name-->
+
+<!--4.6.3:notes-->
+
+* #339 Set `box-sizing: content-box;` only for needed blocks inside a fotorama
+* #323 Fix autoplay interval corruption on mousemove
+* #312 Let browsers round dimensions by themselfs
+* #299 No more collecting fotorama usage statistics via foreign iframe.
+
+<!--/4.6.3:notes-->
+
## 4.6.2, 7 August 2014
<!--4.6.2:name-->
View
@@ -1,6 +1,6 @@
{
"name": "Fotorama",
- "version": "4.6.2",
+ "version": "4.6.3",
"repository": {
"type": "git",
"url": "https://github.com/artpolikarpov/fotorama.git"
View
@@ -1337,10 +1337,10 @@ jQuery.Fotorama = function ($fotorama, opts) {
_activeIndex = activeIndex;
if (typeof video === 'object' && dataFrame.videoReady) {
- //o_nativeFullScreen && that.fullScreen && that.cancelFullScreen();
+ o_nativeFullScreen && that.fullScreen && that.cancelFullScreen();
waitFor(function () {
- return true;//!fullScreenApi.is() || _activeIndex !== activeIndex;
+ return !fullScreenApi.is() || _activeIndex !== activeIndex;
}, function () {
if (_activeIndex === activeIndex) {
dataFrame.$video = dataFrame.$video || $($.Fotorama.jst.video(video));
View
@@ -29,8 +29,6 @@
<p>The show stops on&nbsp;touch. Change this with <code>data-stop-autoplay-on-touch="false"</code>.</p>
-<!-- Just don’t want to repeat this prefix in every img[src] -->
-<base href="i/okonechnikov/">
<!-- Fotorama -->
<div class="fotorama"
@@ -40,43 +38,26 @@
data-fit="cover"
data-nav="none"
data-autoplay="1500"
- data-arrows="false"
- data-click="false"
- data-swipe="false"
- data-loop="true"
+ data-arrows="true"
+ data-click="true"
+ data-swipe="true"
+ data-loop="false"
data-trackpad="false"
data-stopautoplayontouch="false">
- <a href="1-lo.jpg"><img src="1-thumb.jpg"></a>
- <a href="2-lo.jpg"><img src="2-thumb.jpg"></a>
- <a href="3-lo.jpg"><img src="3-thumb.jpg"></a>
- <a href="4-lo.jpg"><img src="4-thumb.jpg"></a>
- <a href="25-lo.jpg"><img src="25-thumb.jpg"></a>
- <a href="26-lo.jpg"><img src="26-thumb.jpg"></a>
- <a href="27-lo.jpg"><img src="27-thumb.jpg"></a>
- <a href="28-lo.jpg"><img src="28-thumb.jpg"></a>
- <a href="29-lo.jpg"><img src="29-thumb.jpg"></a>
- <a href="30-lo.jpg"><img src="30-thumb.jpg"></a>
- <a href="11-lo.jpg"><img src="11-thumb.jpg"></a>
- <a href="12-lo.jpg"><img src="12-thumb.jpg"></a>
- <a href="13-lo.jpg"><img src="13-thumb.jpg"></a>
- <a href="14-lo.jpg"><img src="14-thumb.jpg"></a>
- <a href="15-lo.jpg"><img src="15-thumb.jpg"></a>
- <a href="16-lo.jpg"><img src="16-thumb.jpg"></a>
- <a href="20-lo.jpg"><img src="20-thumb.jpg"></a>
- <a href="21-lo.jpg"><img src="21-thumb.jpg"></a>
- <a href="22-lo.jpg"><img src="22-thumb.jpg"></a>
- <a href="23-lo.jpg"><img src="23-thumb.jpg"></a>
- <a href="24-lo.jpg"><img src="24-thumb.jpg"></a>
- <a href="17-lo.jpg"><img src="17-thumb.jpg"></a>
- <a href="18-lo.jpg"><img src="18-thumb.jpg"></a>
- <a href="19-lo.jpg"><img src="19-thumb.jpg"></a>
+ <a href="i/okonechnikov/1-lo.jpg"></a>
+ <a href="i/okonechnikov/2-lo.jpg"></a>
+ <a href="i/okonechnikov/9-lo.jpg"></a>
+ <a href="i/okonechnikov/6-lo.jpg"></a>
+ <a href="i/okonechnikov/5-lo.jpg"></a>
</div>
<script>'use strict';
-$('.fotorama').on('fotorama:showend', function (e, fotorama) {
-if (fotorama.size - fotorama.activeIndex === 1) {
- fotorama.stopAutoplay();
-}
+var prev = Date.now();
+
+$('.fotorama').on('fotorama:show', function (e, fotorama) {
+ var now = Date.now() ;
+ console.log('fotorama:show:', now - prev);
+ prev = now;
});
</script>
@@ -26,9 +26,9 @@
<!-- Fotorama -->
<div class="fotorama"
- data-width="700"
data-ratio="3/2"
- data-max-width="100%">
+ data-height="90%"
+ data-maxheight="100%">
<a href="i/okonechnikov/1-lo.jpg" data-width="700" data-height="467"></a>
<a href="i/okonechnikov/2-lo.jpg"></a>
<a href="i/okonechnikov/12-lo.jpg" data-width="311" data-height="467"></a>
@@ -67,7 +67,7 @@
data-width="700"
data-ratio="3/2"
data-max-width="100%"
- data-fit="cover"
+ data-fit="contain"
data-allow-full-screen="true">
<a href="i/nyc/guy-in-car.jpg"><img src="i/nyc/thumbs/guy-in-car.jpg" width="500" height="335"></a>
<a data-video="http://www.youtu.be/HmiVRWAVS3I">Englishman In New York</a>
@@ -52,7 +52,6 @@
style="width: 50%; position: relative; max-width: 400px;"
data-width="700"
data-ratio="3/2"
- data-max-width="200"
data-fit="cover"
data-allow-full-screen="true">
<a href="i/okonechnikov/9-lo.jpg"></a>
View
@@ -18,6 +18,7 @@
<li><a href="autoplay--loop.html">autoplay--loop.html</a></li>
<li><a href="autoplay.html">autoplay.html</a></li>
<li><a href="base--1.html">base--1.html</a></li>
+<li><a href="base--312.html">base--312.html</a></li>
<li><a href="base--dimensions.html">base--dimensions.html</a></li>
<li><a href="base--iframe.html">base--iframe.html</a></li>
<li><a href="base--no-click.html">base--no-click.html</a></li>
@@ -43,6 +43,10 @@
</style>
<script>
$(function () {
+ $(document).on('keydown keypress', function (e) {
+ console.log('$document', e.type, e.keyCode);
+ });
+
$('.js-arrow').on('mousedown', function (e) {
e.preventDefault();
@@ -43,6 +43,7 @@
data-hash="true"
data-thumb-height="48"
data-thumbmargin="10"
+ data-allowfullscreen="native"
data-nav="thumbs">
<a href="i/nyc/guy-in-car.jpg"><img src="i/nyc/thumbs/guy-in-car.jpg" width="500" height="335"></a>
<a data-video="http://www.youtu.be/HmiVRWAVS3I">Englishman In New York</a>

0 comments on commit 0344b9d

Please sign in to comment.