Skip to content
This repository has been archived by the owner on Apr 20, 2020. It is now read-only.

Commit

Permalink
Updated openkarotz-js to 0.4.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
hobbe committed Jan 26, 2014
1 parent 347b794 commit 632f27f
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,11 @@ Radio stations may be customized in the `data/radios.json` configuration file.
### Stories

Stories may be customized in the `data/stories.json` configuration file.

## License ##

Copyright (c) 2013-2014 Olivier Bagot

Licensed under [The MIT License (MIT)](http://opensource.org/licenses/MIT)

See [LICENSE](https://github.com/hobbe/openkarotz-mui/raw/master/LICENSE)
2 changes: 1 addition & 1 deletion html/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"karotz": {
"host": "localhost",
"host": "",
"name": "Karotz",
"voice" : "claire"
}
Expand Down
2 changes: 1 addition & 1 deletion html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h4 class="panel-title">
<script src="lib/fancybox/jquery.fancybox.pack.js"></script>
<script src="lib/fancybox/helpers/jquery.fancybox-thumbs.js"></script>
<script src="lib/bootstrap/js/bootstrap.min.js"></script>
<script src="lib/openkarotz/openkarotz-0.3.1.min.js"></script>
<script src="lib/openkarotz/openkarotz-0.4.0.min.js"></script>
<script src="js/openkarotz-mui.js"></script>
</body>
</html>
9 changes: 3 additions & 6 deletions html/js/openkarotz-mui.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* - jQuery 1.10+
* - FancyBox 2.1.5+
* - Bootstrap 3.0+
* - OpenKarotz-js 0.3+
* - OpenKarotz-js 0.4+
*/

// Config to be loaded from /config.json
Expand Down Expand Up @@ -127,7 +127,7 @@ function kSleep() {
}

function kWakeUp() {
K.wakeup(function(result) {
K.wakeup(true, function(result) {
kStatus();
}, function(msg) {
showAlert(msg);
Expand Down Expand Up @@ -179,7 +179,7 @@ function kLedPulse(color) {
}

function kEars(left, right) {
K.ears(left, right, null, function(msg) {
K.ears(left, right, true, null, function(msg) {
showAlert(msg);
});
}
Expand Down Expand Up @@ -221,15 +221,12 @@ function loadSnapshots() {
}

function kSnapshot() {
//$.fancybox.showLoading();
$.fancybox({
href : 'lib/fancybox/fancybox_loading@2x.gif',
//href : 'img/throbber.gif',
title : 'Capture',
autoSize: true,
closeBtn : false,
beforeShow : function() {
//$(".fancybox-skin").css("backgroundColor", "#999999");
$(".fancybox-skin").css("display", "none");
$.fancybox.showLoading();
}
Expand Down
4 changes: 0 additions & 4 deletions html/lib/openkarotz/openkarotz-0.3.1.min.js

This file was deleted.

4 changes: 4 additions & 0 deletions html/lib/openkarotz/openkarotz-0.4.0.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 632f27f

Please sign in to comment.