summaryrefslogtreecommitdiffstats
path: root/apps/samples
diff options
context:
space:
mode:
authorAutobuilder at buildslave-ubuntu-12-32 <magnus@alkit.se>2013-11-04 14:48:42 (GMT)
committerAutobuilder at buildslave-ubuntu-12-32 <magnus@alkit.se>2013-11-04 14:48:42 (GMT)
commit8d466ce1171b78cd234d6e63d09d058888a17e2d (patch)
tree6f9c876116bbffcfe300bae7547d7654ba91af81 /apps/samples
parent492bac74e7b4d7e80cfa1fa859a4f7067e3a9910 (diff)
downloaduscxml-8d466ce1171b78cd234d6e63d09d058888a17e2d.zip
uscxml-8d466ce1171b78cd234d6e63d09d058888a17e2d.tar.gz
uscxml-8d466ce1171b78cd234d6e63d09d058888a17e2d.tar.bz2
added miles/stop
Diffstat (limited to 'apps/samples')
-rw-r--r--apps/samples/miles/miles.js29
-rw-r--r--apps/samples/miles/miles.scxml15
2 files changed, 36 insertions, 8 deletions
diff --git a/apps/samples/miles/miles.js b/apps/samples/miles/miles.js
index a340e07..1ef1c68 100644
--- a/apps/samples/miles/miles.js
+++ b/apps/samples/miles/miles.js
@@ -18,9 +18,11 @@ function Miles(element, params) {
// private attributes
var scxmlURL = "localhost:8080"
var reflectorIp = "88.131.107.12"
- var email = "user@smartvortex.eu";
+ //var email = "user@smartvortex.eu";
+ var email = "mathias";
var problemName = "webconfero";
- var remoteEmail = "other@smartvortex.eu";
+ //var remoteEmail = "other@smartvortex.eu";
+ var remoteEmail = "stefan";
var participants = []; // empty array
var videoCompressions = [
@@ -92,10 +94,25 @@ function Miles(element, params) {
}
this.disconnect = function() {
- self.connected = false;
- hideChat();
- self.controlDropDown.dropDown.onCancel(true);
- self.controlElem.replaceChild(self.connectDropDown.domNode, self.controlDropDown.domNode);
+ var query = "";
+ query += "?reflector=" + encodeURIComponent(reflectorIp);
+ query += "&userid=" + encodeURIComponent(email);
+ query += "&session=" + encodeURIComponent(problemName);
+
+ self.xhr.get({
+ // The URL to request
+ url: "http://" + scxmlURL + "/miles/stop" + query,
+ // handleAs:"text",
+ error: function(err) {
+ console.log(err);
+ },
+ load: function(result) {
+ self.connected = false;
+ hideChat();
+ self.controlDropDown.dropDown.onCancel(true);
+ self.controlElem.replaceChild(self.connectDropDown.domNode, self.controlDropDown.domNode);
+ }
+ });
}
var hideChat = function() {
diff --git a/apps/samples/miles/miles.scxml b/apps/samples/miles/miles.scxml
index 9e486b4..1889ffa 100644
--- a/apps/samples/miles/miles.scxml
+++ b/apps/samples/miles/miles.scxml
@@ -11,12 +11,14 @@
<respond status="200" to="_event.data.origin">
<header name="Cache-Control" value="no-cache" /> <!-- force IE to actually reload -->
<header name="Content-Type" value="text/plain" />
+ <header name="Access-Control-Allow-Origin" value="*" />
<content expr="_event.data.image.base64()" />
</respond>
<else />
<respond status="200" to="_event.data.origin">
<header name="Cache-Control" value="no-cache" /> <!-- force IE to actually reload -->
<!-- respond element will add content-type header -->
+ <header name="Access-Control-Allow-Origin" value="*" />
<content expr="_event.data" />
</respond>
</if>
@@ -39,7 +41,7 @@
<transition event="http.get" target="idle">
<log label="in" expr="_event.data.path" />
- <script>//dump(_event);</script>
+ <script>dump(_event);</script>
<if cond="false">
<!-- START ############### -->
@@ -51,6 +53,15 @@
<param name="session" expr="_event.data.query.session" />
</send>
+ <!-- STOP ############### -->
+ <elseif cond="_event.data.pathComponent[1] === 'stop'" />
+ <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="session" expr="_event.data.query.session" />
+ </send>
+
<!-- PARTICIPANTS ############### -->
<elseif cond="_event.data.pathComponent[1] === 'participants'" />
<send target="#_miles" event="participants">
@@ -153,4 +164,4 @@
</state>
</state>
-</scxml> \ No newline at end of file
+</scxml>