wip #4866 @2

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 04b770c62e2df28298067f133713795572b5ac25..89e5b31bdb848af08a1fcd64a210b53b7a1dc387 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -428,7 +428,6 @@ Fluidbook.prototype = {
         $(this).trigger('fluidbook.hashchange', [args.slice()]);
 
         if (args[1] === 'closeview') {
-            s
             return this.setCurrentPage(this.currentPage);
         } else if (args[1] === 'page') {
             var anchor = false;

diff --git a/js/libs/fluidbook/fluidbook.stats.js b/js/libs/fluidbook/fluidbook.stats.js
index d1f243d751d3bd9b9f0ee85dee2d695ee04177be..31303cfe090c05bdea69e77668da8cb0b3f05964 100644 (file)
--- a/js/libs/fluidbook/fluidbook.stats.js
+++ b/js/libs/fluidbook/fluidbook.stats.js
@@ -59,14 +59,34 @@ FluidbookStats.prototype = {
         var $this = this;\r
         $(this.fluidbook).on('fluidbook.hashchange', function (e, data) {\r
             data.shift();\r
+            if (!$this.fluidbook.displayOnePage && data[0] == 'page') {\r
+                var p = parseInt(data[1]);\r
+                if (!isNaN(p)) {\r
+                    var even, odd;\r
+                    if (p % 2 === 0) {\r
+                        even = p;\r
+                        odd = p + 1;\r
+                    } else {\r
+                        odd = p;\r
+                        even = p - 1;\r
+                    }\r
+                    if ($this.fluidbook.settings.tagcommander_plan['page/' + even] !== undefined) {\r
+                        data[1] = even;\r
+                    } else if ($this.fluidbook.settings.tagcommander_plan['page/' + odd] !== undefined) {\r
+                        data[1] = odd;\r
+                    }\r
+                }\r
+            }\r
             var hash = data.join('/');\r
             if (hash === this.lastTCHash) {\r
                 return;\r
             }\r
             this.lastTCHash = hash;\r
+\r
             if ($this.fluidbook.settings.tagcommander_plan[hash]) {\r
                 window.tc_vars = {};\r
                 $.extend(window.tc_vars, $this.fluidbook.settings.tagcommander_default_vars, $this.fluidbook.settings.tagcommander_plan[hash]);\r
+                console.info('Tag commander', window.tc_vars);\r
                 try {\r
                     tC.container.reload({events: {page: [{}, {}]}});\r
                 } catch (e) {\r