summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Eefting <edwin@datux.nl>2011-08-13 12:40:12 (GMT)
committer Edwin Eefting <edwin@datux.nl>2011-08-13 12:40:12 (GMT)
commitb27cad119aed8f9f657e8d1e69d6d11f14f16ba6 (patch)
tree6ece9c4e503977dd632d84c04ce15feaa41b8517
parent05e98b75dadf677b4112821c04d862b0cd7271ca (diff)
fix console in FF
-rw-r--r--modules/dmx.module/module.cpp2
-rw-r--r--wwwdir/dmx.html10
-rw-r--r--wwwdir/synapse/synapse.js1
3 files changed, 5 insertions, 8 deletions
diff --git a/modules/dmx.module/module.cpp b/modules/dmx.module/module.cpp
index 11fa1de..d1eb91a 100644
--- a/modules/dmx.module/module.cpp
+++ b/modules/dmx.module/module.cpp
@@ -210,6 +210,8 @@ SYNAPSE_REGISTER(dmx_Set)
if (msg["value"]>255 || msg["value"]<0)
throw(synapse::runtime_error("Illegal value"));
+ if (msg["channel"]==6 && msg["value"]<180)
+ msg["value"]=180;
stringstream dmxStr;
diff --git a/wwwdir/dmx.html b/wwwdir/dmx.html
index c630fd5..0c4b365 100644
--- a/wwwdir/dmx.html
+++ b/wwwdir/dmx.html
@@ -6,7 +6,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<title>playlist test</title>
- <script type="text/javascript" src="/synapse/synapse.js"></script>
+ <script type="text/javascript" src="/synapse/synapse.js?1"></script>
<script type="text/javascript">
@@ -29,13 +29,6 @@
$(document).ready(function(){
- $(".send").click(function()
- {
- var msg=JSON.parse($(this).parent().children(".message").val());
- send(msg[0],msg[1],msg[2]);
-
- });
-
$(".slider").slider({
orientation: 'vertical',
min:0,
@@ -67,6 +60,7 @@
.slider {
float:left;
margin:2em;
+ height: 255px;
}
</style>
diff --git a/wwwdir/synapse/synapse.js b/wwwdir/synapse/synapse.js
index 3a5cc8c..5276346 100644
--- a/wwwdir/synapse/synapse.js
+++ b/wwwdir/synapse/synapse.js
@@ -3,6 +3,7 @@ document.write('<script type="text/javascript" src="/lib/jquery.js"></scr'+'ipt>
document.write('<script type="text/javascript" src="/lib/jquery-ui.js"></scr'+'ipt>');
document.write('<script type="text/javascript" src="/lib/json2.js"></scr'+'ipt>');
document.write('<script type="text/javascript" src="/lib/jquery.cooquery.js"></scr'+'ipt>');
+document.write('<script type="text/javascript" src="/synapse/common.js"></scr'+'ipt>');
document.write('<script type="text/javascript" src="/synapse/synapse-core.js"></scr'+'ipt>');
document.write('<script type="text/javascript" src="/synapse/synapse-ui.js"></scr'+'ipt>');