wip #5112 @2

diff --git a/js/libs/fluidbook/fluidbook.stats.js b/js/libs/fluidbook/fluidbook.stats.js
index d7ba2fe302566b61115892e3d39f859279322b45..4e10e74a3da2dc29112374441a22747336a77983 100644 (file)
--- a/js/libs/fluidbook/fluidbook.stats.js
+++ b/js/libs/fluidbook/fluidbook.stats.js
@@ -73,7 +73,13 @@ FluidbookStats.prototype = {
     initTagCommander: function () {\r
         var $this = this;\r
         $(this.fluidbook).on('fluidbook.hashchange', function (e, data) {\r
+            if (window.location.hash === this.lastTCHash) {\r
+                return;\r
+            }\r
+            this.lastTCHash = window.location.hash;\r
+\r
             data.shift();\r
+            var hashes = [];\r
             if (!$this.fluidbook.displayOnePage && data[0] == 'page') {\r
                 var p = parseInt(data[1]);\r
                 if (!isNaN(p)) {\r
@@ -87,27 +93,47 @@ FluidbookStats.prototype = {
                     }\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
+                        hashes.push(data.join('/'));\r
+                    }\r
+\r
+                    if ($this.fluidbook.settings.tagcommander_plan['page/' + odd] !== undefined) {\r
                         data[1] = odd;\r
+                        hashes.push(data.join('/'));\r
                     }\r
                 }\r
+            } else {\r
+                hashes.push(data.join('/'));\r
             }\r
-            var hash = data.join('/');\r
-            if (hash === this.lastTCHash) {\r
-                return;\r
+\r
+            var custom_vars = {};\r
+            if (window.location.toString().indexOf('workshop.fluidbook.com') >= 0) {\r
+                custom_vars.env_work = 'pre-prod';\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
+\r
+            $.each(hashes, function (k, hash) {\r
+                if ($this.fluidbook.settings.tagcommander_plan[hash]) {\r
+                    setTimeout(function () {\r
+                        window.tc_vars = {};\r
+                        var location = window.location.toString().split("#")[0];\r
+                        location += '#/' + hash;\r
+                        custom_vars.url = location;\r
+\r
+\r
+                        $.extend(window.tc_vars, $this.fluidbook.settings.tagcommander_default_vars, custom_vars, $this.fluidbook.settings.tagcommander_plan[hash]);\r
+                        console.log(custom_vars);\r
+                        console.info('Tag commander', window.tc_vars);\r
+                        try {\r
+                            tC.container.reload({events: {page: [{}, {}]}});\r
+                        } catch (e) {\r
+                            console.error(e);\r
+                        }\r
+                    }, 500 * k)\r
 \r
                 }\r
-            }\r
+            });\r
+\r
+\r
         });\r
     },\r
 \r