Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Berry <bryan@olenepal.org>2009-12-18 03:44:10 (GMT)
committer Bryan Berry <bryan@olenepal.org>2009-12-18 03:44:10 (GMT)
commit797e7254cc5c9d973c8c9f3d6211e5bac145abdd (patch)
tree5899c97a481d1a12af506e4d9ae31239428e62cd
parent0018f81dcf6a6f94e08c3d1f0fe7af08f88ce6af (diff)
add sounds to Conozco
-rwxr-xr-xexamples/Conozco-Uruguay/assets/audio/correct.oggbin0 -> 12811 bytes
-rwxr-xr-xexamples/Conozco-Uruguay/assets/audio/incorrect.oggbin0 -> 12683 bytes
-rwxr-xr-xexamples/Conozco-Uruguay/index.html1
l---------examples/Conozco-Uruguay/js/.#lesson.js1
-rwxr-xr-xexamples/Conozco-Uruguay/js/lesson.js9
5 files changed, 9 insertions, 2 deletions
diff --git a/examples/Conozco-Uruguay/assets/audio/correct.ogg b/examples/Conozco-Uruguay/assets/audio/correct.ogg
new file mode 100755
index 0000000..a0d9e3a
--- /dev/null
+++ b/examples/Conozco-Uruguay/assets/audio/correct.ogg
Binary files differ
diff --git a/examples/Conozco-Uruguay/assets/audio/incorrect.ogg b/examples/Conozco-Uruguay/assets/audio/incorrect.ogg
new file mode 100755
index 0000000..4805e55
--- /dev/null
+++ b/examples/Conozco-Uruguay/assets/audio/incorrect.ogg
Binary files differ
diff --git a/examples/Conozco-Uruguay/index.html b/examples/Conozco-Uruguay/index.html
index a593e10..fba0dc8 100755
--- a/examples/Conozco-Uruguay/index.html
+++ b/examples/Conozco-Uruguay/index.html
@@ -6,7 +6,6 @@
content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal,urugay" />
<link rel="stylesheet" type="text/css" href="jquery.svg.css" />
<link rel="stylesheet" type="text/css" href="css/lesson.css" />
- <script type="text/javascript" src="../../js/raphael-min.js"></script>
<script type="text/javascript" src="../../js/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="../../js/karma.js"></script>
<script type="text/javascript" src="../../js/jquery.svg.js"></script>
diff --git a/examples/Conozco-Uruguay/js/.#lesson.js b/examples/Conozco-Uruguay/js/.#lesson.js
new file mode 120000
index 0000000..d205d66
--- /dev/null
+++ b/examples/Conozco-Uruguay/js/.#lesson.js
@@ -0,0 +1 @@
+hitman@xiaopo.26688:1260879216 \ No newline at end of file
diff --git a/examples/Conozco-Uruguay/js/lesson.js b/examples/Conozco-Uruguay/js/lesson.js
index cfd2e7c..5e8e890 100755
--- a/examples/Conozco-Uruguay/js/lesson.js
+++ b/examples/Conozco-Uruguay/js/lesson.js
@@ -9,8 +9,12 @@ $(document).ready(
{name:'playAgain', domId:'playAgain'},
{name:'helpIcon', domId:'helpIcon'},
{name:'quitIcon', domId:'quitIcon'}
+ ],
+ audio:[
+ {name:'correct', file:'correct.ogg'},
+ {name:'incorrect', file:'incorrect.ogg'}
]
- });
+ });
k.ready(function() {
//Program constants
@@ -154,6 +158,7 @@ $(document).ready(
$('#' + part, spaceshipRoot).css('display', 'block');
alienBubble.text("Correct! " + question.capitalName +
" is the capital of " + question.deptName);
+ k.audio.correct.play();
var text = $('.text.' + question.dept, capRoot);
text.css('display', "block");
@@ -174,6 +179,8 @@ $(document).ready(
} else {
alienBubble.text("Incorrect. Please try again.");
+ k.audio.incorrect.play();
+
setTimeout(function(){
askQuestion(questions, true);
},1000);