(no commit message)

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 845a28d6fd9155096253861768ba631854cebc7c..17b728a78bd91d14ac70b9ed049db36c80d8dd16 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -611,6 +611,7 @@ Fluidbook.prototype = {
                                $this.beforeTransition(pageNr, 2);\r
                                $("#currentDoublePage").addClass('axis_' + $this.transitionAxis).addClass('_2d').addClass(turning.currentToClass);\r
                                $(doublePage).removeClass(turning.nextFromClass).one($this.support.getTransitionEndEvent(), function() {\r
+                                       fb('received event');\r
                                        if ($this.transitionning == false) {\r
                                                return;\r
                                        }\r
@@ -647,11 +648,15 @@ Fluidbook.prototype = {
                this.hideUnnecessaryButtons(page);\r
                var animationDuration = d <= 1 ? 0 : parseFloat(this.datas.mobileTransitionDuration);\r
                this.updateShadows(page, animationDuration);\r
+\r
+               fb('beforeTransition ' + page);\r
        },\r
        afterTransition: function(page) {\r
                if (this.transitionning === false) {\r
                        //return;\r
                }\r
+               fb('afterTransition ' + page);\r
+\r
                var $this = this;\r
                this.currentPage = page;\r
 \r

diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js
index 5f59b37687bdd6ce214f07667a3c32421fc6f5e0..05b7db35d13c44885a0b19f9e16fd0a1cd01e0b0 100644 (file)
--- a/js/libs/fluidbook/fluidbook.support.js
+++ b/js/libs/fluidbook/fluidbook.support.js
@@ -32,17 +32,8 @@ function FluidbookSupport(fluidbook) {
 
 FluidbookSupport.prototype = {
        getTransitionEndEvent: function() {
-               if (this.transitionendevent == null) {
-                       var transEndEventNames = {
-                               'WebkitTransition': 'webkitTransitionEnd',
-                               'MozTransition': 'transitionend',
-                               'OTransition': 'oTransitionEnd',
-                               'msTransition': 'MSTransitionEnd',
-                               'transition': 'transitionend'
-                       };
-                       this.transitionendevent = transEndEventNames[ Modernizr.prefixed('transition') ];
-               }
-               return this.transitionendevent;
+               fb(this.transitionEndEvent);
+               return this.transitionEndEvent;
        },
        hasNetwork: function() {
                if (navigator.onLine != undefined) {
@@ -104,6 +95,30 @@ FluidbookSupport.prototype = {
                        }, 100);
                }
 
+
+               // Test transition end event
+               var div = document.createElement('div');
+               div.id = "my-transition-test";
+               div.style.position = 'absolute';
+               div.style.zIndex = -10;
+               div.style.bottom = '-1000px';
+               div.style.height = '100px';
+               div.style.width = '100px';
+               div.style.background = 'yellow';
+               div.style.display = 'hidden';
+               window.document.body.appendChild(div);
+
+               $('#my-transition-test').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function(e) {
+                       if ($this.transitionEndEvent !== e.type) {
+                               $this.transitionEndEvent = e.type;
+                       }
+                       window.document.body.removeChild(div);
+               });
+
+               setTimeout(function() {
+                       div.style[Modernizr.prefixed('transition')] = '0.1s';
+                       div.style[Modernizr.prefixed('transform')] = 'translate3d( 100px,0,0)';
+               }, 25);
        },
        checkOrientation: function() {
                var o = this.getOrientation();

diff --git a/js/libs/modernizr/tests.js b/js/libs/modernizr/tests.js
index eda053c465fd34a2dd1b8148caa03bd24516357b..a32c73387165e5b06bde5d140202367aa63aed85 100644 (file)
--- a/js/libs/modernizr/tests.js
+++ b/js/libs/modernizr/tests.js
@@ -31,10 +31,10 @@ Modernizr.addTest('ftouch', function() {
        return bool;
 });
 
-Modernizr.addTest('fullscreen',function(){
-     for(var i = 0; i < Modernizr._domPrefixes.length; i++) {
-        if( document[Modernizr._domPrefixes[i].toLowerCase() + 'CancelFullScreen'])
-            return true;
-     }
-     return !!document['cancelFullScreen'] || false;
+Modernizr.addTest('fullscreen', function() {
+       for (var i = 0; i < Modernizr._domPrefixes.length; i++) {
+               if (document[Modernizr._domPrefixes[i].toLowerCase() + 'CancelFullScreen'])
+                       return true;
+       }
+       return !!document['cancelFullScreen'] || false;
 });
\ No newline at end of file

diff --git a/js/main.js b/js/main.js
index 12733061d2429603e7ac02312630be32292e01a6..02f8ecd3673eac889eabe8b79cc966bbe7c676e3 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -36,6 +36,10 @@ $(function() {
                }, false);
        }
 
+       
+
+
+
        if (DATAS.phonegap) {
                loadPhonegap();
        } else {