diff options
| author | Stefan Radomski <github@mintwerk.de> | 2013-11-07 11:08:51 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2013-11-07 11:08:51 (GMT) |
| commit | c57b32ea2fa6b80ec35e43d190f251958665a256 (patch) | |
| tree | b1b4ac40fdf5decf870a6d4c8842026fe8421b34 /apps | |
| parent | b2d7e26223288d0e555e8b72ef987be93d2d89ba (diff) | |
| parent | 1dca74be3a40cb878cd284d3572fca020173113a (diff) | |
| download | uscxml-c57b32ea2fa6b80ec35e43d190f251958665a256.zip uscxml-c57b32ea2fa6b80ec35e43d190f251958665a256.tar.gz uscxml-c57b32ea2fa6b80ec35e43d190f251958665a256.tar.bz2 | |
Merge pull request #7 from mathiasjohanson/master
multipoint video
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/samples/miles/miles.html | 6 | ||||
| -rw-r--r-- | apps/samples/miles/miles.js | 1 | ||||
| -rw-r--r-- | apps/samples/miles/miles.scxml | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/apps/samples/miles/miles.html b/apps/samples/miles/miles.html index 08cfeca..5028621 100644 --- a/apps/samples/miles/miles.html +++ b/apps/samples/miles/miles.html @@ -16,9 +16,9 @@ <script type="text/javascript"> require(["dojo/domReady!"], function(dom) { var milesSession1 = new Miles("miles1"); - var milesSession2 = new Miles("miles2"); - var milesSession3 = new Miles("miles3"); - var milesSession4 = new Miles("miles4"); + var milesSession2 = new Miles("miles2", {"scxmlURL": "localhost:8080", "reflectorIp": "88.131.107.12", "email": "user@smartvortex.eu", "problemName": "webconfero", "remoteEmail": "yetanother@smartvortex.eu"}); + var milesSession3 = new Miles("miles3", {"scxmlURL": "localhost:8080", "reflectorIp": "88.131.107.12", "email": "user@smartvortex.eu", "problemName": "webconfero", "remoteEmail": "stillanother@smartvortex.eu"}); + var milesSession4 = new Miles("miles4", {"scxmlURL": "localhost:8080", "reflectorIp": "88.131.107.12", "email": "user@smartvortex.eu", "problemName": "webconfero", "remoteEmail": "last@smartvortex.eu"}); }); </script> </head> diff --git a/apps/samples/miles/miles.js b/apps/samples/miles/miles.js index 451306b..d1efb0d 100644 --- a/apps/samples/miles/miles.js +++ b/apps/samples/miles/miles.js @@ -60,6 +60,7 @@ function Miles(element, params) { if (params && params.reflectorIp) reflectorIp = params.reflectorIp; if (params && params.email) email = params.email; if (params && params.problemName) problemName = params.problemName; + if (params && params.remoteEmail) remoteEmail = params.remoteEmail; // called when dojo loaded all requirements below this.connect = function() { diff --git a/apps/samples/miles/miles.scxml b/apps/samples/miles/miles.scxml index 2cad7ba..c1c6c69 100644 --- a/apps/samples/miles/miles.scxml +++ b/apps/samples/miles/miles.scxml @@ -51,7 +51,7 @@ <send target="#_miles" event="start"> <param name="origin" expr="_event.origin" /> <param name="reflector" expr="_event.data.query.reflector" /> - <param name="userId" expr="_event.data.query.userid" /> + <param name="userid" expr="_event.data.query.userid" /> <param name="session" expr="_event.data.query.session" /> </send> @@ -60,7 +60,7 @@ <send target="#_miles" event="stop"> <param name="origin" expr="_event.origin" /> <param name="reflector" expr="_event.data.query.reflector" /> - <param name="userId" expr="_event.data.query.userid" /> + <param name="userid" expr="_event.data.query.userid" /> <param name="session" expr="_event.data.query.session" /> </send> @@ -74,7 +74,7 @@ <elseif cond="_event.data.pathComponent[1] === 'thumbnail'" /> <send target="#_miles" event="thumbnail"> <param name="origin" expr="_event.origin" /> - <param name="userId" expr="_event.data.query.userid" /> + <param name="userid" expr="_event.data.query.userid" /> </send> <!-- VIDEO ON ############### --> |