resolve merge

forio · Jul 10, 2018 · 3ecfb03 · 3ecfb03
2 parents 9d90004 + dd76f16
commit 3ecfb03
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/service/presence-api-service/index.js b/src/service/presence-api-service/index.js
@@ -175,7 +175,7 @@ export default function (config) {
          *          console.log(onlineUsers[a].isOnline);
          *     });
          *
-         * @param { {userId: string}[] } userList Users to get status for
+         * @param {{userId: string}[]} userList Users to get status for
          * @param  {string} [groupName] If not provided, taken from session cookie.
          * @param  {object} [options] Additional options to change the presence service defaults.
          * 

diff --git a/tests/integration/multiplayer/integration-test-multiplayer.js b/tests/integration/multiplayer/integration-test-multiplayer.js
@@ -52,6 +52,25 @@ $(function () {
             });
         });
     }); 
+    $('#btnBindToWorld').on('click', function () {
+        var worldManager = new F.manager.WorldManager({
+            run: $.extend({}, {
+                account: $('#txtAccount').val(),
+                model: $('#txtModel').val(),
+                project: $('#txtProject').val(),
+            }, server)
+        });
+        worldManager.getCurrentWorld().then(function (worldObject, worldService) {
+            var worldService = new F.service.World($.extend({}, {
+                account: $('#txtAccount').val(),
+                model: $('#txtModel').val(),
+                project: $('#txtProject').val(),
+            }, server));
+            worldService.getPresenceForUsers(worldObject.id).then((pres)=> {
+                console.log(pres);
+            });
+        });
+    }); 
     $('#btnBindToWorld').on('click', function () {
         var worldManager = new F.manager.WorldManager(getServiceOptions());
         worldManager.getCurrentWorld().then(function (worldObject, worldService) {