summaryrefslogtreecommitdiff
path: root/js/test/Ice/acm/Client.js
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-08-18 20:00:56 +0200
committerJose <jose@zeroc.com>2014-08-18 20:00:56 +0200
commitd23e9d7dcd59b148ed83425bbb9dfe62f5bbdd2e (patch)
treec1bf5b85af4f58a1efa36d2713dbec6eeed13def /js/test/Ice/acm/Client.js
parentjava latency demo fixes (diff)
downloadice-d23e9d7dcd59b148ed83425bbb9dfe62f5bbdd2e.tar.bz2
ice-d23e9d7dcd59b148ed83425bbb9dfe62f5bbdd2e.tar.xz
ice-d23e9d7dcd59b148ed83425bbb9dfe62f5bbdd2e.zip
Ice JS WS build fixes
Diffstat (limited to 'js/test/Ice/acm/Client.js')
-rw-r--r--js/test/Ice/acm/Client.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js
index 21872fbf4c1..e2f85001d96 100644
--- a/js/test/Ice/acm/Client.js
+++ b/js/test/Ice/acm/Client.js
@@ -434,7 +434,7 @@
// than 6 connections.
//
if(typeof(navigator) !== "undefined" &&
- (navigator.userAgent.indexOf("MSIE") !== -1 || navigator.userAgent.indexOf("Trident/7.0")))
+ (navigator.userAgent.indexOf("MSIE") != -1 || navigator.userAgent.indexOf("Trident/7.0") != -1))
{
return;
}
@@ -512,14 +512,17 @@
{
id.properties.setProperty("Ice.Warn.Connections", "0");
var c = Ice.initialize(id);
- return allTests(out, c).finally(
- function()
+ var p = allTests(out, c);
+ if(p !== undefined)
+ {
+ p.finally(function()
{
if(c)
{
return c.destroy();
}
});
+ }
});
};
global.__test__ = run;