Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
#	js/libs/fluidbook/fluidbook.js
#	js/libs/fluidbook/fluidbook.links.js
#	js/libs/fluidbook/fluidbook.loader.js
#	js/libs/fluidbook/fluidbook.resize.js
#	js/libs/fluidbook/fluidbook.zoom.js
#	js/main.js

diff --cc js/libs/fluidbook/fluidbook.js
index 68d62c7ff890b4e18f52de3ac2a7a1e849a574f0,94bcb5ac3254b1bacb81b8f6c6294a697ca8df3e..1a18b74b4deb9eaca97997a2898074fbc8ceea2a
--- 1/js/libs/fluidbook/fluidbook.js
--- 2/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -23,13 -19,9 +19,15 @@@ Fluidbook.BOTTOM = 9
  
  Fluidbook.prototype = {
      init: function (datas) {
 +
 +        this.flags = {};
 +        this.networkPause = false;
 +        this.networkPauseTimeout = null;
 +        this.networkPauseQueue = [];
 +
          this.datas = datas;
+         this.singleMode = (this.datas.mobileNavigationType === 'portrait');
+ 
          this.junk = datas.cacheDate;
          if (this.datas.landingPage != undefined && this.datas.landingPage != '') {
              this.landingpage = new FluidbookLandingPage(this);
@@@ -96,15 -92,13 +98,13 @@@
          }
          $('html').addClass(this.datas.mobileLVersion);
          this.currentPage = -1;
-         this.maxPage = this.datas.pages;
-         if (this.datas.maxPages > 0) {
-             this.maxPage = Math.min(this.datas.maxPages, this.datas.pages);
-         }
+ 
+         this.contentlock.init();
  
          this.resize = new FluidbookResize(this);
 +        this.pagetransitions = new FluidbookPageTransition(this);
          this.stats = new FluidbookStats(this);
          this.stats.track(10);
 -        this.flags = {};
  
          this.initTheme();
          this.initKeyboardShortcuts();
@@@ -182,36 -152,15 +156,37 @@@
              navigator.splashscreen.hide();
          } catch (err) {
          }
- 
+         $(this).trigger('fluidbook.splash.beforehide');
          var $this = this;
 -        setTimeout(function () {
 -            $this._hideSplash();
 -        }, 1000);
 +        if (this.support.transitions3dacc) {
 +            this.pauseNetwork(4000);
 +            setTimeout(function () {
 +                this.fluidbook.pagetransitions.flip3d.performancesTest(function () {
 +                    $this.pauseNetwork(-1);
 +                    $this._hideSplash();
 +                })
 +            }, 1000);
 +        } else {
 +            this._hideSplash();
 +        }
      },
 +
      _hideSplash: function () {
 +        var $this = this;
 +
 +        var timeout = 300;
 +        if (this.support.transitions3dacc) {
 +            timeout = 2000;
 +        }
 +
 +        setTimeout(function () {
 +            $this.__hideSplash();
 +        }, timeout);
 +    },
 +
 +    __hideSplash: function () {
          $("#main,#viewOverlay,#view").css('visibility', 'visible');
+         this.resize.resize(false, true);
          this.hideLoader(0, true);
  
          if (this.support.transitions2d) {

diff --cc js/libs/fluidbook/fluidbook.links.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.loader.js
index a338ab35355e8c34a1673c3e6f1866cc14884f8f,6fa2d920ccde9a55fab75118b6a7b5210a144ddf..cbdb47ab0082b836dfed9aad5ea1e1a28fe77730
--- 1/js/libs/fluidbook/fluidbook.loader.js
--- 2/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@@ -47,18 -28,22 +47,18 @@@ FluidbookLoader.prototype = 
              return;
          }
  
 +        this.transitionPages = pages.slice(0);
 +
          var $callback = callback;
          var $page = $pages.shift();
 -        if ($page > this.fluidbook.contentlock.getMaxPage() || $page < 1) {
 -            $this.preloadPagesBeforeTransition($pages, $callback);
 +
-         if ($page == undefined || $page == 'undefined' || $page > this.fluidbook.getMaxPage() || $page < 1) {
++        if ($page == undefined || $page == 'undefined' || $page > this.fluidbook.contentlock.getMaxPage() || $page < 1) {
 +            callback();
              return;
          }
 -        this._loadBackground($page, function () {
 -            if ($this.getVersionToLoad($page) == 'textasvector') {
 -                $this._loadTexts($page, function () {
 -                    $this.preloadPagesBeforeTransition($pages, $callback);
 -                });
 -            } else {
 -                $this.preloadPagesBeforeTransition($pages, $callback);
 -            }
 +        this._preloadPage($page, function () {
 +            $this.preloadPagesBeforeTransition($pages, $callback);
          });
 -
      },
  
      arePreloadedPages: function (pages) {
@@@ -138,29 -85,25 +138,29 @@@
              return;
          }
  
 -        var numPreloadAfter = 5;
 -        var numPreloadBefore = 2;
 +        var numPreloadAfter = 8;
 +        var numPreloadBefore = 4;
          if (this.fluidbook.resize.orientation == 'portrait') {
 -            numPreloadAfter = 3;
 -            numPreloadBefore = 1;
 +            numPreloadAfter = 4;
 +            numPreloadBefore = 2;
          }
-         var fmx = this.fluidbook.getMaxPage();
 -        var max = Math.min(page + numPreloadAfter, this.fluidbook.contentlock.getMaxPage());
++        var fmx = this.fluidbook.contentlock.getMaxPage();
 +        var max = Math.min(page + numPreloadAfter, fmx);
          var min = Math.max(1, page - numPreloadBefore);
 -        this.toPreload = [];
 +        this.toPreload = [1, fmx];
          for (var i = min; i <= max; i++) {
 -            this.toPreload.push(i);
 +            if(this.toPreload.indexOf(i)===-1) {
 +                this.toPreload.push(i);
 +            }
          }
 -
 +        this.preloaded = this.toPreload.slice(0);
          this.cleanPreloaded();
          this.preloadPages();
      },
 -    cleanPreloaded: function () {
 +
 +    _cleanPreloaded: function () {
-         for (var i = 1; i <= this.fluidbook.getMaxPage(); i++) {
+         for (var i = 1; i <= this.fluidbook.contentlock.getMaxPage(); i++) {
 -            if (this.backgrounds[i] != undefined && this.toPreload.indexOf(i) == -1) {
 +            if (this.preloaded.indexOf(i) === -1 && this.transitionPages.indexOf(i) === -1) {
                  this.deletePage(i);
              }
          }

diff --cc js/libs/fluidbook/fluidbook.nav.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.resize.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.zoom.js
Simple merge

diff --cc js/main.js
Simple merge

diff --cc style/fluidbook.less
index 48f002bef2f13e387a16b35afe92e6f3f6fc06e1,21c5571cc07eb8d6d2f0269d861ad4ab95ab6997..c1de30fcda7cb2058fe10298d9b5fa6013e6229a
--- 1/style/fluidbook.less
--- 2/style/fluidbook.less
+++ b/style/fluidbook.less
@@@ -2787,8 -2916,20 +2930,24 @@@ body > input 
        font-style: normal;
  }
  
+ /* Links anims rollovers */
+ @keyframes enterupanddown {
+       0% {
+               margin-top: 0px;
+       }
+       100% {
+               margin-top: -40px;
+       }
+ }
+ 
+ [data-rollover="upanddown"] {
+       &.animaterollover {
+               animation: enterupanddown 0.25s cubic-bezier(0.250, 0.460, 0.450, 0.940) 2 alternate forwards;
+       }
+ }
+ 
  @import "additional.less";
 +
 +#pscanvas {
 +      visibility: hidden;
 +}