diff options
author | Felipe Lopez Toledo <zer.subzero@gmail.com> | 2009-09-10 03:55:20 (GMT) |
---|---|---|
committer | Felipe Lopez Toledo <zer.subzero@gmail.com> | 2009-09-10 03:55:20 (GMT) |
commit | 439049cf4f1b13abf2c28379e32b73a6dcf96c0b (patch) | |
tree | 21d375e3b129a61303ecbfcff8606e76dd13eb96 | |
parent | ada4f81b0260fe302c0429c4db89cd24683c8b05 (diff) | |
parent | 30bd2f8df1fc248f76416fd9dda203c507e9421a (diff) |
Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainline
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_A.png | bin | 1212 -> 1212 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_B.png | bin | 1223 -> 1223 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_C.png | bin | 1205 -> 1205 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_D.png | bin | 1246 -> 1246 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_E.png | bin | 1218 -> 1218 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_F.png | bin | 1135 -> 1135 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_G.png | bin | 1278 -> 1278 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_H.png | bin | 1201 -> 1201 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_I.png | bin | 1037 -> 1037 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_J.png | bin | 1028 -> 1028 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_K.png | bin | 1267 -> 1267 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/month_L.png | bin | 1065 -> 1065 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/olenepal_logo.gif | bin | 2759 -> 2759 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/week1.png | bin | 1111 -> 1111 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/week2.png | bin | 1202 -> 1202 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/week3.png | bin | 1279 -> 1279 bytes | |||
-rwxr-xr-x[-rw-r--r--] | assets/default/images/week4.png | bin | 1158 -> 1158 bytes | |||
-rwxr-xr-x[-rw-r--r--] | examples/adding_up_to_10/css/knavbar.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | examples/adding_up_to_10/exercise.html | 0 | ||||
-rwxr-xr-x | examples/adding_up_to_10/index.html | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | examples/adding_up_to_10/index_knavbar.html | 0 | ||||
-rwxr-xr-x | examples/adding_up_to_10/js/lesson.js | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | examples/adding_up_to_10/resources.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | index_nepal.html | 0 | ||||
-rwxr-xr-x | js/jquery.karma.js | 2 |
25 files changed, 4 insertions, 2 deletions
diff --git a/assets/default/images/month_A.png b/assets/default/images/month_A.png Binary files differindex a8b02a4..a8b02a4 100644..100755 --- a/assets/default/images/month_A.png +++ b/assets/default/images/month_A.png diff --git a/assets/default/images/month_B.png b/assets/default/images/month_B.png Binary files differindex 908c64f..908c64f 100644..100755 --- a/assets/default/images/month_B.png +++ b/assets/default/images/month_B.png diff --git a/assets/default/images/month_C.png b/assets/default/images/month_C.png Binary files differindex d4a0ae1..d4a0ae1 100644..100755 --- a/assets/default/images/month_C.png +++ b/assets/default/images/month_C.png diff --git a/assets/default/images/month_D.png b/assets/default/images/month_D.png Binary files differindex a8b1f28..a8b1f28 100644..100755 --- a/assets/default/images/month_D.png +++ b/assets/default/images/month_D.png diff --git a/assets/default/images/month_E.png b/assets/default/images/month_E.png Binary files differindex 3fa8a05..3fa8a05 100644..100755 --- a/assets/default/images/month_E.png +++ b/assets/default/images/month_E.png diff --git a/assets/default/images/month_F.png b/assets/default/images/month_F.png Binary files differindex 0daa502..0daa502 100644..100755 --- a/assets/default/images/month_F.png +++ b/assets/default/images/month_F.png diff --git a/assets/default/images/month_G.png b/assets/default/images/month_G.png Binary files differindex 77e2f7c..77e2f7c 100644..100755 --- a/assets/default/images/month_G.png +++ b/assets/default/images/month_G.png diff --git a/assets/default/images/month_H.png b/assets/default/images/month_H.png Binary files differindex 3a99b7c..3a99b7c 100644..100755 --- a/assets/default/images/month_H.png +++ b/assets/default/images/month_H.png diff --git a/assets/default/images/month_I.png b/assets/default/images/month_I.png Binary files differindex 4931ec1..4931ec1 100644..100755 --- a/assets/default/images/month_I.png +++ b/assets/default/images/month_I.png diff --git a/assets/default/images/month_J.png b/assets/default/images/month_J.png Binary files differindex ee11c0d..ee11c0d 100644..100755 --- a/assets/default/images/month_J.png +++ b/assets/default/images/month_J.png diff --git a/assets/default/images/month_K.png b/assets/default/images/month_K.png Binary files differindex 16a0dcc..16a0dcc 100644..100755 --- a/assets/default/images/month_K.png +++ b/assets/default/images/month_K.png diff --git a/assets/default/images/month_L.png b/assets/default/images/month_L.png Binary files differindex 2beef36..2beef36 100644..100755 --- a/assets/default/images/month_L.png +++ b/assets/default/images/month_L.png diff --git a/assets/default/images/olenepal_logo.gif b/assets/default/images/olenepal_logo.gif Binary files differindex e520424..e520424 100644..100755 --- a/assets/default/images/olenepal_logo.gif +++ b/assets/default/images/olenepal_logo.gif diff --git a/assets/default/images/week1.png b/assets/default/images/week1.png Binary files differindex 6776412..6776412 100644..100755 --- a/assets/default/images/week1.png +++ b/assets/default/images/week1.png diff --git a/assets/default/images/week2.png b/assets/default/images/week2.png Binary files differindex 7b73212..7b73212 100644..100755 --- a/assets/default/images/week2.png +++ b/assets/default/images/week2.png diff --git a/assets/default/images/week3.png b/assets/default/images/week3.png Binary files differindex 4ab1f76..4ab1f76 100644..100755 --- a/assets/default/images/week3.png +++ b/assets/default/images/week3.png diff --git a/assets/default/images/week4.png b/assets/default/images/week4.png Binary files differindex 448e403..448e403 100644..100755 --- a/assets/default/images/week4.png +++ b/assets/default/images/week4.png diff --git a/examples/adding_up_to_10/css/knavbar.css b/examples/adding_up_to_10/css/knavbar.css index 26e3896..26e3896 100644..100755 --- a/examples/adding_up_to_10/css/knavbar.css +++ b/examples/adding_up_to_10/css/knavbar.css diff --git a/examples/adding_up_to_10/exercise.html b/examples/adding_up_to_10/exercise.html index eaf3d63..eaf3d63 100644..100755 --- a/examples/adding_up_to_10/exercise.html +++ b/examples/adding_up_to_10/exercise.html diff --git a/examples/adding_up_to_10/index.html b/examples/adding_up_to_10/index.html index 2b97559..ac27b7d 100755 --- a/examples/adding_up_to_10/index.html +++ b/examples/adding_up_to_10/index.html @@ -61,7 +61,7 @@ </div> <div class="sidebarItem"> <img id="scorebox" src="assets/generic/images/scorebox.png" alt=""/> - <canvas id="scoreboxCanvas" width="100" height="140" /> + <canvas id="scoreboxCanvas" width="100" height="140"></canvas> </div> <div class="sidebarItem"> <canvas id="chimpCanvas" width="120px" height="125px"> </canvas> diff --git a/examples/adding_up_to_10/index_knavbar.html b/examples/adding_up_to_10/index_knavbar.html index e1e2fca..e1e2fca 100644..100755 --- a/examples/adding_up_to_10/index_knavbar.html +++ b/examples/adding_up_to_10/index_knavbar.html diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10/js/lesson.js index 82fc2ac..15ed461 100755 --- a/examples/adding_up_to_10/js/lesson.js +++ b/examples/adding_up_to_10/js/lesson.js @@ -240,7 +240,7 @@ k.main(function() { game(); }, true); }); - timerId = setInterval (timerFn, 4000); + timerId = setInterval (timerFn, 2000); k.library.images["normalChimp"].draw(k.surfaces["chimp"].ctx, 0, 0); game(); //end of Karma.main diff --git a/examples/adding_up_to_10/resources.html b/examples/adding_up_to_10/resources.html index bb4c85a..bb4c85a 100644..100755 --- a/examples/adding_up_to_10/resources.html +++ b/examples/adding_up_to_10/resources.html diff --git a/index_nepal.html b/index_nepal.html index 9b7e28f..9b7e28f 100644..100755 --- a/index_nepal.html +++ b/index_nepal.html diff --git a/js/jquery.karma.js b/js/jquery.karma.js index 07783b8..98571c4 100755 --- a/js/jquery.karma.js +++ b/js/jquery.karma.js @@ -658,7 +658,9 @@ var KSurface = Class( } this.width = this.canvas.width; this.height = this.canvas.height; + if (!this.id){ this.id = this.canvas.id; + } } if ( this.canvas.getContext ) { this.ctx = this.canvas.getContext("2d"); |