done #2206 @1.25

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index 86c10deae7b4417803e357d0b11c65427a1db272..5ca6acd4429d3f3641b1d0b0b94e2e19f530a6e4 100644 (file)
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -162,8 +162,9 @@ FluidbookLinks.prototype = {
             $this.fluidbook.initVideos();
             $this.initInlineSlideshows();
         }, 200);
-        $(fluidbook).trigger('fluidbooklinksready');
+
         $(fluidbook).trigger('fluidbook.links.ready');
+
         this.resize();
     },
 
@@ -173,14 +174,27 @@ FluidbookLinks.prototype = {
 
         var $this = this;
         var links = $(".link a.displayArea");
-        $(links).addClass('animating').css('opacity', 1);
 
-        TweenMax.to($(links), $this.fluidbook.datas.linkBlinkTime, {
-            opacity: 0, delay: 0.1, onComplete: function () {
-                $(links).removeClass('animating').css('opacity', 1)
+        $(links).each(function () {
+            var delay = $(this).data('blinkdelay');
+            if (delay === undefined || delay === null) {
+                delay = 0;
+            } else {
+                delay = parseInt(delay);
             }
+            var e = this;
+
+            setTimeout(function () {
+                $(e).addClass('animating').css('opacity', 1);
+                TweenMax.to(e, $this.fluidbook.datas.linkBlinkTime, {
+                    opacity: 0, delay: .1, onComplete: function () {
+                        $(e).removeClass('animating').css('opacity', 1)
+                    }
+                });
+            }, delay);
         });
 
+
         if (animateBookmarks) {
             var bookmarks = $("#links .bookmark:not([data-enabled])");
             $(bookmarks).addClass('animating').css('opacity', 1);
@@ -386,8 +400,6 @@ FluidbookLinks.prototype = {
                 if ($(next).length == 0) {
                     next = $this.find('.slide:eq(0)');
                 }
-                console.log(current);
-                console.log(next);
 
                 $(next).addClass('show');
                 $(current).removeClass('show');

diff --git a/js/libs/fluidbook/special/wescosales.js b/js/libs/fluidbook/special/wescosales.js
index c46fed846f8b237ae9dfbe9417c9c90202b8ed29..c8eff7b96ad8eab5336e9f45e04d3d880500d18f 100644 (file)
--- a/js/libs/fluidbook/special/wescosales.js
+++ b/js/libs/fluidbook/special/wescosales.js
@@ -5,7 +5,7 @@ $(function () {
     if(fluidbook.datas.basket) {
         $(fluidbook).on('fluidbookready', initWesco);
         $(fluidbook).on('fluidbooknavready', initWescoNav);
-        $(fluidbook).on('fluidbooklinksready', wescoLinksReady);
+        $(fluidbook).on('fluidbook.links.ready', wescoLinksReady);
         $(fluidbook).on('fluidbook.resize', wescoResize);
     }
 });