diff options
author | Bryan Berry <bryan@olenepal.org> | 2009-11-03 03:24:44 (GMT) |
---|---|---|
committer | Bryan Berry <bryan@olenepal.org> | 2009-11-03 03:24:44 (GMT) |
commit | 198a44e915f49436275abe1fb6645cfd82fd201e (patch) | |
tree | adfe0481162a80c83d8a6071ae2c2265da824fee | |
parent | d56e195b08ec2014cc93cc52a2ff6f3881465ca9 (diff) |
changed constructor so u can invoke it w/ no arguments
-rwxr-xr-x | examples/adding_up_to_10_canvas/js/lesson.js | 2 | ||||
-rwxr-xr-x | examples/adding_up_to_10_svg/js/lesson.js | 4 | ||||
-rwxr-xr-x | js/jquery.karma.js | 28 |
3 files changed, 18 insertions, 16 deletions
diff --git a/examples/adding_up_to_10_canvas/js/lesson.js b/examples/adding_up_to_10_canvas/js/lesson.js index 1860dd9..f9adcd7 100755 --- a/examples/adding_up_to_10_canvas/js/lesson.js +++ b/examples/adding_up_to_10_canvas/js/lesson.js @@ -1,7 +1,7 @@ $(document).ready(function(){ - var k = $.karma ({container: "#karma-main", lang: "en"}); + var k = $.karma(); k.init({ images: [ diff --git a/examples/adding_up_to_10_svg/js/lesson.js b/examples/adding_up_to_10_svg/js/lesson.js index 6a810c9..dcf1b70 100755 --- a/examples/adding_up_to_10_svg/js/lesson.js +++ b/examples/adding_up_to_10_svg/js/lesson.js @@ -3,7 +3,7 @@ $(document).ready(function(){ - var k = $.karma({container: "#karma-main", lang: "en"}); + var k = $.karma(); k.init({ images: [ @@ -74,7 +74,7 @@ k.main(function() { bottomMiddleCard, bottomRightCard]; sets = [topLeftCard.set, topRightCard.set, bottomLeftCard.set, - bottomMiddleCard.set, bottomRightCard.set]; + bottomMiddleCard.set, bottomRightCard.set]; function drawCards () { diff --git a/js/jquery.karma.js b/js/jquery.karma.js index bdd212e..bce3cd5 100755 --- a/js/jquery.karma.js +++ b/js/jquery.karma.js @@ -32,8 +32,7 @@ /** * @fileOverview Contains karma library * @version 0.2 -* @authors Felipe Lopez Toledo <zer.subzero@gmail.com>, Bryan Berry -* <bryan@karmaeducation.org> +* @authors Felipe Lopez Toledo <zer.subzero@gmail.com>, Bryan Berry <bryan@karmaeducation.org> */ @@ -264,7 +263,7 @@ var Karma = function( options ) { //PRIVATE STUFF end // default options var defaultOptions ={ - container: "#karma-main", + container: "#karma-main", language: { lang: undefined, alternatives: ['en-US', 'en'], @@ -311,16 +310,19 @@ var Karma = function( options ) { //this doesn't work right now so commenting out //try to load the localized lang file (po or json or ...) //that.language.fileLoaded = loadAlternatives( ); - //initializes the container - if ( typeof that.container === "string" ) { - that.container = $( that.container )[ 0 ]; - if ( !valid(that.container) ) delete that.container; - } - - gk = { - "paths": that.paths - } - that.surfaces = {}; + + //initializes the container that holds sounds, images, video, svg, etc. + containerNode = document.createElement("div"); + containerNode.setAttribute("id", defaultOptions.container); + containerNode.setAttribute("style", "position: absolute; display: none"); + document.documentElement.appendChild(containerNode); + that.container = containerNode; + if ( !valid(that.container) ){ delete that.container;} + + gk = { + "paths": that.paths + } + that.surfaces = {}; }; /** |