From 9fc8bd820a8c9929ac34e21dc06f71dc06c9b264 Mon Sep 17 00:00:00 2001
From: Erik Rothoff Andersson <erik.rothoff@gmail.com>
Date: Tue, 17 Nov 2015 12:59:21 +0100
Subject: [PATCH] Fix bug where first call would be ignored

---
 dist/glimr.min.js |  2 +-
 src/glimr.js      |  5 +++--
 test/index.php    | 24 +++++++++++++++++++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/dist/glimr.min.js b/dist/glimr.min.js
index bdebcbf..c9b969e 100644
--- a/dist/glimr.min.js
+++ b/dist/glimr.min.js
@@ -1 +1 @@
-!function(e){"use strict";var t="//pixel.glimr.io/v3/iptags/:id/",Glimr={_loadedTags:{},_loadingTags:{},JSONP:function(t,i){var n=(new Date).getTime(),o="glmrjsonp"+Math.round(n+1000001*Math.random());e[o]=function(t){i(t);try{delete e[o]}catch(n){e[o]=void 0}try{r.parentNode.removeChild(r)}catch(n){}},t+=-1===t.indexOf("?")?"?":"&",t+="callback="+o;var r=document.createElement("script");"function"==typeof r.addEventListener&&r.addEventListener("error",function(){i(!1)},!1),r.setAttribute("src",t),document.getElementsByTagName("head")[0].appendChild(r)},createCookie:function(e,t,i){var n=document.location.hostname.split("."),o=n.slice(n.length-2,n.length).join("."),r="";if(i){var a=new Date;a.setTime(a.getTime()+24*i*60*60*1e3),r="; expires="+a.toGMTString()}document.cookie=e+"="+t+r+"; path=/; domain="+o},readCookie:function(e){for(var t=e+"=",i=document.cookie.split(";"),n=0;n<i.length;n+=1){for(var o=i[n];" "===o.charAt(0);)o=o.substring(1,o.length);if(0===o.indexOf(t))return o.substring(t.length,o.length)}return null},generateUUID:function(){var e=(new Date).getTime();return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var i=(e+16*Math.random())%16|0;return e=Math.floor(e/16),("x"===t?i:3&i|8).toString(16)})},initGlimrId:function(){Glimr.glimrId=Glimr.readCookie("__glmrid"),Glimr.glimrId||(Glimr.glimrId=Glimr.generateUUID(),Glimr.setCookie())},setCookie:function(){Glimr.createCookie("__glmrid",Glimr.glimrId)},getTags:function(e,i){if("undefined"!=typeof Glimr._loadedTags[e])return void i(Glimr._loadedTags[e]);if("undefined"!=typeof Glimr._loadingTags[e])return void Glimr._loadingTags[e].push(i);Glimr._loadingTags[e]=[];try{Glimr.initGlimrId(),Glimr.JSONP(t.replace(":id",e)+"?id="+Glimr.glimrId,function(t){var i=[];t&&t.tags&&(i=t.tags),Glimr._loadedTags[e]=i;for(var n=Glimr._loadingTags[e],o=0;o<n.length;o+=1)n[o](i);delete Glimr._loadingTags[e],"string"==typeof t.id&&t.id!==Glimr.glimrId&&(Glimr.glimrId=t.id,Glimr.setCookie())})}catch(n){i([])}}};e.Glimr=Glimr}(window);
+!function(e){"use strict";var t="//pixel.glimr.io/v3/iptags/:id/",Glimr={_loadedTags:{},_loadingTags:{},JSONP:function(t,i){var n=(new Date).getTime(),o="glmrjsonp"+Math.round(n+1000001*Math.random());e[o]=function(t){i(t);try{delete e[o]}catch(n){e[o]=void 0}try{r.parentNode.removeChild(r)}catch(n){}},t+=-1===t.indexOf("?")?"?":"&",t+="callback="+o;var r=document.createElement("script");"function"==typeof r.addEventListener&&r.addEventListener("error",function(){i(!1)},!1),r.setAttribute("src",t),document.getElementsByTagName("head")[0].appendChild(r)},createCookie:function(e,t,i){var n=document.location.hostname.split("."),o=n.slice(n.length-2,n.length).join("."),r="";if(i){var a=new Date;a.setTime(a.getTime()+24*i*60*60*1e3),r="; expires="+a.toGMTString()}document.cookie=e+"="+t+r+"; path=/; domain="+o},readCookie:function(e){for(var t=e+"=",i=document.cookie.split(";"),n=0;n<i.length;n+=1){for(var o=i[n];" "===o.charAt(0);)o=o.substring(1,o.length);if(0===o.indexOf(t))return o.substring(t.length,o.length)}return null},generateUUID:function(){var e=(new Date).getTime();return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var i=(e+16*Math.random())%16|0;return e=Math.floor(e/16),("x"===t?i:3&i|8).toString(16)})},initGlimrId:function(){Glimr.glimrId=Glimr.readCookie("__glmrid"),Glimr.glimrId||(Glimr.glimrId=Glimr.generateUUID(),Glimr.setCookie())},setCookie:function(){Glimr.createCookie("__glmrid",Glimr.glimrId)},getTags:function(e,i){if("undefined"!=typeof Glimr._loadedTags[e])return void i(Glimr._loadedTags[e]);if("undefined"!=typeof Glimr._loadingTags[e])return void Glimr._loadingTags[e].push(i);Glimr._loadingTags[e]=[],Glimr._loadingTags[e].push(i);try{Glimr.initGlimrId(),Glimr.JSONP(t.replace(":id",e)+"?id="+Glimr.glimrId,function(t){var i=[];t&&t.tags&&(i=t.tags),Glimr._loadedTags[e]=i;var n=Glimr._loadingTags[e];delete Glimr._loadingTags[e];for(var o=0;o<n.length;o+=1)n[o](i);"string"==typeof t.id&&t.id!==Glimr.glimrId&&(Glimr.glimrId=t.id,Glimr.setCookie())})}catch(n){i([])}}};e.Glimr=Glimr}(window);
diff --git a/src/glimr.js b/src/glimr.js
index 1bd7297..3895e95 100644
--- a/src/glimr.js
+++ b/src/glimr.js
@@ -102,6 +102,7 @@
       }
 
       Glimr._loadingTags[pixelId] = [];
+      Glimr._loadingTags[pixelId].push(callback);
 
       try {
         Glimr.initGlimrId();
@@ -115,12 +116,12 @@
           Glimr._loadedTags[pixelId] = tags;
 
           var callbacks = Glimr._loadingTags[pixelId];
+          delete Glimr._loadingTags[pixelId];
+
           for (var i = 0; i < callbacks.length; i += 1) {
             callbacks[i](tags);
           }
 
-          delete Glimr._loadingTags[pixelId];
-
           if (typeof data.id === "string" && data.id !== Glimr.glimrId) {
             Glimr.glimrId = data.id;
             Glimr.setCookie();
diff --git a/test/index.php b/test/index.php
index 6cad2be..10033c0 100644
--- a/test/index.php
+++ b/test/index.php
@@ -5,12 +5,30 @@
 <body>
   <script src="glimr.min.js.php"></script>
 
-  <h1 id="foo"></h1>
+  <h1 id="foo1"></h1>
+  <hr>
+  <h1 id="foo2"></h1>
 
   <script>
-    for (var i = 0; i < 10; i++) {
+    "use strict";
+
+    for (let i = 0; i < 10; i++) {
       Glimr.getTags("TESTCLIENTID", function(tags) {
-        document.getElementById("foo").innerHTML += "Got tags: <br>[" + tags.join(", ") + "]<br>";
+        document.getElementById("foo1").innerHTML += i + "<br>Got tags: <br>[" + tags.join(", ") + "]<br>";
+
+        Glimr.getTags("TESTCLIENTID", function(tags) {
+          document.getElementById("foo1").innerHTML += i + ".2<br>Got tags: <br>[" + tags.join(", ") + "]<br>";
+        });
+      });
+    }
+
+    for (let i = 0; i < 1; i++) {
+      Glimr.getTags("TESTCLIENTID2", function(tags) {
+        document.getElementById("foo2").innerHTML += i + "<br>Got tags: <br>[" + tags.join(", ") + "]<br>";
+
+        Glimr.getTags("TESTCLIENTID2", function(tags) {
+          document.getElementById("foo1").innerHTML += i + ".2<br>Got tags: <br>[" + tags.join(", ") + "]<br>";
+        });
       });
     }
   </script>