Fixed compare builders issue(the real time functions call order doesn…

…'t depend on instant JSON elements order)
Unity-Technologies · Jun 9, 2016 · 06288fa · 06288fa
1 parent 205a1ea
commit 06288fa
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 16 deletions.
diff --git a/www/prod/script/main.js b/www/prod/script/main.js
diff --git a/www/prod/script/main.js.map b/www/prod/script/main.js.map
diff --git a/www/script/project/realtimePages.js b/www/script/project/realtimePages.js
@@ -139,14 +139,25 @@ define(function (require) {
         },
         updateRealTimeData: function (json, instantJSON) {
             if (instantJSON === true) {
+                var realTimeFuncData = {}
                 $.each(json, function (name, jObj) {
                     var data = jObj.data;
                     if (typeof data === "string") {
                         data = JSON.parse(data);
                         realtimeURLs[name] = jObj.url;
                     }
+
+                    if (realTimeFunctions.hasOwnProperty(name)) {
+                        realTimeFuncData[name] = data;
+                        return true;
+                    }
                     realtimePages.updateSingleRealTimeData(name, data);
                 });
+
+                // Real time functions should be called preserving their order in the list, should not depend on instantJson elements order
+                $.each(Object.keys(realTimeFunctions), function(i, name){
+                    realtimePages.updateSingleRealTimeData(name, realTimeFuncData[name]);
+                });
             } else {
                 var name = realtimePages.getRealtimeNameFromURL(json.url);
                 realtimePages.updateSingleRealTimeData(name, json.data);

diff --git a/www/script/test/test_realTime.js b/www/script/test/test_realTime.js
@@ -29,6 +29,31 @@ define(["jquery", "realtimePages", "rtGlobal"], function ($, rt, rtGlobal) {
             rt.getInstantJSON();
             expect($("#instant-json").length).toEqual(0);
         });
+
+        it("elements order doesn't define realtime functions call order(preserve the order of real time functions call)", function () {
+            var callsLog = []
+            var realtimeFunctionsList = {
+                example: function () {
+                    return callsLog.push("example");
+                },
+                codebases: function () {
+                    return callsLog.push("codebases");
+                },
+                builder0: function () {
+                    return callsLog.push("builder0");
+                },
+                builder1: function () {
+                    return callsLog.push("builder1");
+                }
+            },
+            realtimeDataList = {data: {"cmd": "krtJSONData", "data": {"url": "http://test.com", "data": {"builder0":["builder0"], "builder1":["builder1"], "codebases":["codebases"], "example": ["example"]}}}};
+
+            rt.setReloadCooldown(5000);
+
+            rt.initRealtime(realtimeFunctionsList);
+            rt.updateRealTimeData(realtimeDataList.data.data.data, true);
+            expect(Object.keys(realtimeFunctionsList)).toEqual(callsLog);
+        });
     });
 
     describe("A websocket", function () {