feedback plugin basically works

19 files changed, 12 insertions, 9 deletions

diff --git a/examples/2_Maths_countingSheep/assets/image/bg.png b/examples/2_Maths_countingSheep/assets/image/bg.png
index 6602635..6602635 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/bg.png
+++ b/examples/2_Maths_countingSheep/assets/image/bg.png
diff --git a/examples/2_Maths_countingSheep/assets/image/help.png b/examples/2_Maths_countingSheep/assets/image/help.png
index f2f4f33..f2f4f33 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/help.png
+++ b/examples/2_Maths_countingSheep/assets/image/help.png
diff --git a/examples/2_Maths_countingSheep/assets/image/help_text.png b/examples/2_Maths_countingSheep/assets/image/help_text.png
index 72083b1..72083b1 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/help_text.png
+++ b/examples/2_Maths_countingSheep/assets/image/help_text.png
diff --git a/examples/2_Maths_countingSheep/assets/image/icon.png b/examples/2_Maths_countingSheep/assets/image/icon.png
index 740a558..740a558 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/icon.png
+++ b/examples/2_Maths_countingSheep/assets/image/icon.png
diff --git a/examples/2_Maths_countingSheep/assets/image/rubbish.png b/examples/2_Maths_countingSheep/assets/image/rubbish.png
index 040dbfa..040dbfa 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/rubbish.png
+++ b/examples/2_Maths_countingSheep/assets/image/rubbish.png
diff --git a/examples/2_Maths_countingSheep/assets/image/rubbish_open.png b/examples/2_Maths_countingSheep/assets/image/rubbish_open.png
index f611aea..f611aea 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/rubbish_open.png
+++ b/examples/2_Maths_countingSheep/assets/image/rubbish_open.png
diff --git a/examples/2_Maths_countingSheep/assets/image/shadow.png b/examples/2_Maths_countingSheep/assets/image/shadow.png
index b351d43..b351d43 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/shadow.png
+++ b/examples/2_Maths_countingSheep/assets/image/shadow.png
diff --git a/examples/2_Maths_countingSheep/assets/image/sheep1.png b/examples/2_Maths_countingSheep/assets/image/sheep1.png
index 9b1aa97..9b1aa97 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/sheep1.png
+++ b/examples/2_Maths_countingSheep/assets/image/sheep1.png
diff --git a/examples/2_Maths_countingSheep/assets/image/sheep2.png b/examples/2_Maths_countingSheep/assets/image/sheep2.png
index 7e738bd..7e738bd 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/sheep2.png
+++ b/examples/2_Maths_countingSheep/assets/image/sheep2.png
diff --git a/examples/2_Maths_countingSheep/assets/image/sheep3.png b/examples/2_Maths_countingSheep/assets/image/sheep3.png
index 4290d9d..4290d9d 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/sheep3.png
+++ b/examples/2_Maths_countingSheep/assets/image/sheep3.png
diff --git a/examples/2_Maths_countingSheep/assets/image/title.png b/examples/2_Maths_countingSheep/assets/image/title.png
index 90446ed..90446ed 100644..100755
--- a/examples/2_Maths_countingSheep/assets/image/title.png
+++ b/examples/2_Maths_countingSheep/assets/image/title.png
diff --git a/examples/2_Maths_countingSheep/css/karma.css b/examples/2_Maths_countingSheep/css/karma.css
index bce5ee2..bce5ee2 100644..100755
--- a/examples/2_Maths_countingSheep/css/karma.css
+++ b/examples/2_Maths_countingSheep/css/karma.css
diff --git a/examples/2_Maths_countingSheep/css/lesson.css b/examples/2_Maths_countingSheep/css/lesson.css
index a997677..a997677 100644..100755
--- a/examples/2_Maths_countingSheep/css/lesson.css
+++ b/examples/2_Maths_countingSheep/css/lesson.css
diff --git a/examples/2_Maths_countingSheep/index.html b/examples/2_Maths_countingSheep/index.html
index ccea70d..ccea70d 100644..100755
--- a/examples/2_Maths_countingSheep/index.html
+++ b/examples/2_Maths_countingSheep/index.html
diff --git a/examples/2_Maths_countingSheep/js/lesson.js b/examples/2_Maths_countingSheep/js/lesson.js
index 0b3a58a..0b3a58a 100644..100755
--- a/examples/2_Maths_countingSheep/js/lesson.js
+++ b/examples/2_Maths_countingSheep/js/lesson.js
diff --git a/examples/2_Maths_countingSheep/js/ui.draggable.js b/examples/2_Maths_countingSheep/js/ui.draggable.js
index 0402f0e..0402f0e 100644..100755
--- a/examples/2_Maths_countingSheep/js/ui.draggable.js
+++ b/examples/2_Maths_countingSheep/js/ui.draggable.js
diff --git a/examples/2_Maths_countingSheep/js/ui.droppable.js b/examples/2_Maths_countingSheep/js/ui.droppable.js
index 8e7be33..8e7be33 100644..100755
--- a/examples/2_Maths_countingSheep/js/ui.droppable.js
+++ b/examples/2_Maths_countingSheep/js/ui.droppable.js
diff --git a/examples/English_Animal_Identification/index.html b/examples/English_Animal_Identification/index.html
index 5ca983b..bdb8bac 100755
--- a/examples/English_Animal_Identification/index.html
+++ b/examples/English_Animal_Identification/index.html
@@ -13,6 +13,7 @@
 	<script type="text/javascript" src="../../js/ui.draggable.js"></script>

 	<script type="text/javascript" src="../../js/ui.dialog.js"></script>

 	<script type="text/javascript" src="../../js/ui.scoreboard.js"></script>

+	<script type="text/javascript" src="../../js/ui.feedback.js"></script>

 	<script type="text/javascript" src="../../js/karma.js"></script>

 	<script type="text/javascript" src="js/lesson.js"></script>

 </head>

@@ -44,6 +45,7 @@
 	    <div id="kHeaderHelp" title="Help Me!">foobar</div>

 	</div>

 

+	<div id="feedback"></div>

 

 	<div id="gameArea">

 		<div id="questionBox">What is this?</div>

diff --git a/examples/English_Animal_Identification/js/lesson.js b/examples/English_Animal_Identification/js/lesson.js
index 65ad4a6..4d12839 100755
--- a/examples/English_Animal_Identification/js/lesson.js
+++ b/examples/English_Animal_Identification/js/lesson.js
@@ -26,6 +26,8 @@ $(document).ready(
 		position:[ 650, 50], modal:'true',autoOpen:false
 		});
 	    
+	    var $feedback = $('#feedback').feedback();
+	    
 	    $('#kHeaderHelpBtn').click(function(){ $help.dialog('open');});
 
 	    var scoreboard = $('#scoreArea').scoreboard({'winningScore': 6});
@@ -43,17 +45,16 @@ $(document).ready(
 	 
 	 function checkDisplay(){   //Displays the correct and incorrect info
 		 if(wrong_selected == 1){
-			 $('.checkedOption').show();
-			 document.getElementById("check").src = 
-				  "assets/image/incorrect.png";
-			  k.audio.incorrect.play();
-		       $('.checkedOption').fadeOut(1000);
+		     $('.checkedOption').show();
+		     $feedback.feedback('incorrect');
+		     $('.checkedOption').fadeOut(1000);
 		 }
 		 else{
-			 $('.checkedOption').hide();
-			 document.getElementById("check").src = "assets/image/correct.png";
-			  k.audio.correct.play();
-			  $('.checkedOption').fadeOut(2000);
+		     $('.checkedOption').hide();
+		     //document.getElementById("check").src = "assets/image/correct.png";
+			//  k.audio.correct.play();
+		      $feedback.feedback('correct');
+		     $('.checkedOption').fadeOut(2000);
 			 //needs timer for holding on for abt a sec
 		 }
 	 }