Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhitman <bryan@olenepal.org>2009-09-09 11:00:27 (GMT)
committer hitman <bryan@olenepal.org>2009-09-09 11:00:27 (GMT)
commit0b2f5792313b5cd2a439f34cf130b185ba74c307 (patch)
tree20779b1fcf8dc6a0045f3eec26f70d28b6bd5fe1
parent4e936b613e41e4c120b03b4de99aed25206b9c75 (diff)
merged my local epaath branches
Diffstat
-rwxr-xr-xexamples/adding_up_to_10/index1.html29
-rwxr-xr-xexamples/adding_up_to_10/index_multiple.html29
-rwxr-xr-xexamples/adding_up_to_10/js/lesson.js88
-rwxr-xr-xjs/jquery.karma.js2
4 files changed, 46 insertions, 102 deletions
diff --git a/examples/adding_up_to_10/index1.html b/examples/adding_up_to_10/index1.html
deleted file mode 100755
index 129c7f0..0000000
--- a/examples/adding_up_to_10/index1.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <title>Karma - Adding Up to 10</title>
- <meta name="keywords" content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal">
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <link type="image/ico" rel="icon" href="../../assets/default/images/favicon.ico" />
- <script type="text/javascript" src="../../js/jquery-1.3.2.min.js"></script>
- <script type="text/javascript" src="../../js/karma.Gettext.js"></script>
- <script type="text/javascript" src="../../js/jquery.karma.js"></script>
- <script type="text/javascript" src="js/index1.js"></script>
-
- <style type="text/css">
- #left { border: 2px black solid;}
- #right { border: 2px black solid;}
- </style>
-
-
-
-</head>
-
-<body>
- <div id="karma-main" >
- <canvas id="left" width="300" height="300"> </canvas>
- <canvas id="right" width="300" height="300"> </canvas>
- </div>
-</body>
-
-</html>
diff --git a/examples/adding_up_to_10/index_multiple.html b/examples/adding_up_to_10/index_multiple.html
deleted file mode 100755
index 15e5caa..0000000
--- a/examples/adding_up_to_10/index_multiple.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en">
-
-<head>
- <title>Karma - Adding Up to 10</title>
- <meta name="keywords" content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal">
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
- <link type="image/ico" rel="icon" href="../../assets/default/images/favicon.ico" />
-
- <link type="text/css" rel="stylesheet" href="../../css/karma.css" />
- <link type="text/css" rel="stylesheet" href="css/lesson_multiple.css" />
-
- <script type="text/javascript" src="../../js/jquery-1.3.2.min.js"></script>
- <script type="text/javascript" src="../../js/karma.Gettext.js"></script>
- <script type="text/javascript" src="../../js/jquery.karma.js"></script>
- <script type="text/javascript" src="js/lesson_multiple.js"></script>
-
-</head>
-
-<body>
- <div id="karma-main" > </div>
- <canvas id="inlineCanvas1" width="200px" height="200px"></canvas>
- click the second box!
- <canvas id="inlineCanvas2" width="200px" height="200px"></canvas>
-</body>
-
-</html>
diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10/js/lesson.js
index 4f8aabe..bf54fd3 100755
--- a/examples/adding_up_to_10/js/lesson.js
+++ b/examples/adding_up_to_10/js/lesson.js
@@ -2,16 +2,7 @@ $(document).ready(function(){
var k = $.karma ({container: "#karma-main", lang: "en"});
- k.layer( {id:"topLt", canvas:"topLtCanvas", width: 200, height: 200});
- k.layer( {id:"topRt", canvas:"topRtCanvas", width: 200, height: 200} );
- k.layer( {id:"bottomLt", canvas:"bottomLtCanvas", width: 200, height: 200});
- k.layer( {id:"bottomMd", canvas:"bottomMdCanvas", width: 200, height: 200});
- k.layer( {id:"bottomRt", canvas:"bottomRtCanvas", width: 200, height: 200});
- k.layer( {id:"timer", canvas:"timerCanvas", width: 100, height: 140} );
- k.layer( {id:"scorebox", canvas:"scoreboxCanvas"} );
- k.layer( {id:"chimp", canvas:"chimpCanvas"} );
-
-k.init({
+ k.init({
images: [
{id: "ball", file: "ball37px.png", localized : false },
{id: "balloon", file: "balloon37px.png", localized : false },
@@ -31,14 +22,25 @@ k.init({
{id: "incorrect", file: "incorrect.ogg"},
{id: "trigger", file: "trigger.ogg"}
- ]
-});
-
+ ],
+ surfaces: [
+ {id:"topLt", canvas:"topLtCanvas", width: 200, height: 200},
+ {id:"topRt", canvas:"topRtCanvas", width: 200, height: 200},
+ {id:"bottomLt", canvas:"bottomLtCanvas", width: 200, height: 200},
+ {id:"bottomMd", canvas:"bottomMdCanvas", width: 200, height: 200},
+ {id:"bottomRt", canvas:"bottomRtCanvas", width: 200, height: 200},
+ {id:"timer", canvas:"timerCanvas", width: 100, height: 140},
+ {id:"scorebox", canvas:"scoreboxCanvas"},
+ {id:"chimp", canvas:"chimpCanvas"}
+
+ ]
+ });
+
k.main(function() {
- var actionContexts = [ k.layers["topLt"].ctx, k.layers["topRt"].ctx,
- k.layers["bottomLt"].ctx, k.layers["bottomMd"].ctx,
- k.layers["bottomRt"].ctx];
+ var actionContexts = [ k.surfaces["topLt"].ctx, k.surfaces["topRt"].ctx,
+ k.surfaces["bottomLt"].ctx, k.surfaces["bottomMd"].ctx,
+ k.surfaces["bottomRt"].ctx];
var imgNames = ["ball", "banana", "balloon","chilli", "fish", "flower"];
@@ -55,7 +57,7 @@ k.main(function() {
var timerId;
var timerFn = function () {
- k.layers['timer'].clear();
+ k.surfaces['timer'].clear();
if ( startTimerY >= endTimerY ){
//you didn't answer in time
@@ -64,16 +66,16 @@ k.main(function() {
game();
}
else {
- k.layers['timer'].clear();
+ k.surfaces['timer'].clear();
startTimerY = startTimerY + offsetTimerY;
- k.layers['timer'].ctx.fillStyle = "#fff";
- k.layers['timer'].ctx.fillRect(10, startTimerY, endTimerX, 20);
+ k.surfaces['timer'].ctx.fillStyle = "#fff";
+ k.surfaces['timer'].ctx.fillRect(10, startTimerY, endTimerX, 20);
}
};
function game () {
- $.each(k.layers, function () {
+ $.each(k.surfaces, function () {
if (this.id != "chimp"){
this.clear();
}
@@ -144,22 +146,22 @@ k.main(function() {
//put the cards
- card(k.layers["topLt"].ctx, n0 , 0, 0, d);
- card(k.layers["topRt"].ctx, n1 , 0, 0, d);
- card(k.layers["bottomLt"].ctx, choices[ 0 ] , 0, 0, d);
- card(k.layers["bottomMd"].ctx, choices[ 1 ] , 0, 0, d);
- card(k.layers["bottomRt"].ctx, choices[ 2 ] , 0, 0, d);
+ card(k.surfaces["topLt"].ctx, n0 , 0, 0, d);
+ card(k.surfaces["topRt"].ctx, n1 , 0, 0, d);
+ card(k.surfaces["bottomLt"].ctx, choices[ 0 ] , 0, 0, d);
+ card(k.surfaces["bottomMd"].ctx, choices[ 1 ] , 0, 0, d);
+ card(k.surfaces["bottomRt"].ctx, choices[ 2 ] , 0, 0, d);
}
var writeScore = function (){
- k.layers["scorebox"].ctx.save();
- k.layers["scorebox"].clear();
- k.layers["scorebox"].ctx.font = "bold 50px sans-serif white";
- k.layers["scorebox"].ctx.fillStyle = "#fff";
- k.layers["scorebox"].ctx.textBaseline = "middle";
- k.layers["scorebox"].ctx.fillText("" + score, 30, 100);
- k.layers["scorebox"].ctx.restore();
+ k.surfaces["scorebox"].ctx.save();
+ k.surfaces["scorebox"].clear();
+ k.surfaces["scorebox"].ctx.font = "bold 50px sans-serif white";
+ k.surfaces["scorebox"].ctx.fillStyle = "#fff";
+ k.surfaces["scorebox"].ctx.textBaseline = "middle";
+ k.surfaces["scorebox"].ctx.fillText("" + score, 30, 100);
+ k.surfaces["scorebox"].ctx.restore();
};
var answer = function (correct, tooSlow) {
@@ -189,18 +191,18 @@ k.main(function() {
};
var animateChimp = function (answer) {
- k.layers["chimp"].clear();
+ k.surfaces["chimp"].clear();
if( answer === true){
- k.library.images["happyChimp"].draw(k.layers["chimp"].
+ k.library.images["happyChimp"].draw(k.surfaces["chimp"].
ctx, 0, 0);
} else {
- k.library.images["sadChimp"].draw(k.layers["chimp"].
+ k.library.images["sadChimp"].draw(k.surfaces["chimp"].
ctx, 0, 0);
}
var restoreChimp = function () {
- k.layers["chimp"].clear();
- k.library.images["normalChimp"].draw(k.layers["chimp"].
+ k.surfaces["chimp"].clear();
+ k.library.images["normalChimp"].draw(k.surfaces["chimp"].
ctx, 0, 0);
};
@@ -212,7 +214,7 @@ k.main(function() {
var reset = function () {
score = level = 0;
startTimerY = 10;
- $.each(k.layers, function () {
+ $.each(k.surfaces, function () {
if (this.id != "chimp"){
this.clear();
}
@@ -228,9 +230,9 @@ k.main(function() {
//put the buttons
var buttons=[];
- buttons[ 0 ] = { "canvas": k.layers["bottomLt"].canvas, "id": 0};
- buttons[ 1 ] = { "canvas": k.layers["bottomMd"].canvas, "id": 1};
- buttons[ 2 ] = { "canvas": k.layers["bottomRt"].canvas, "id": 2};
+ buttons[ 0 ] = { "canvas": k.surfaces["bottomLt"].canvas, "id": 0};
+ buttons[ 1 ] = { "canvas": k.surfaces["bottomMd"].canvas, "id": 1};
+ buttons[ 2 ] = { "canvas": k.surfaces["bottomRt"].canvas, "id": 2};
$.each(buttons, function( key, item ) {
item.canvas.addEventListener('click', function( ev ) {
@@ -241,7 +243,7 @@ k.main(function() {
}, true);
});
timerId = setInterval (timerFn, 4000);
- k.library.images["normalChimp"].draw(k.layers["chimp"].ctx, 0, 0);
+ k.library.images["normalChimp"].draw(k.surfaces["chimp"].ctx, 0, 0);
game();
//end of Karma.main
});
diff --git a/js/jquery.karma.js b/js/jquery.karma.js
index 63d4e4d..00016f4 100755
--- a/js/jquery.karma.js
+++ b/js/jquery.karma.js
@@ -695,7 +695,7 @@ var KSurface = Class(
x || 0,
y || 0,
width || this.canvas.width,
- height || this.canvas.width
+ height || this.canvas.height
);
},
draw: function ( ) {
generated by cgit v0.9.1 at 2024-05-04 13:40:22 (GMT)