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-17 07:52:39 (GMT)
committer Bryan Berry <bryan@olenepal.org>2009-12-17 07:52:39 (GMT)
commitf764e1ea7a83a3c73c17ebbe969d3c22538a65a2 (patch)
treef771cb3bd995eb57bb2ec8e654ad7aba315442c7
parentf32600e9686a1ed1b950538c9491e21ef3aac6f4 (diff)
changed Conozco to use opacity to hide the svg's rather than display:none
-rwxr-xr-xexamples/Conozco-Uruguay/css/lesson.css1
-rwxr-xr-xexamples/Conozco-Uruguay/js/lesson.js41
2 files changed, 24 insertions, 18 deletions
diff --git a/examples/Conozco-Uruguay/css/lesson.css b/examples/Conozco-Uruguay/css/lesson.css
index b05c150..1c24338 100755
--- a/examples/Conozco-Uruguay/css/lesson.css
+++ b/examples/Conozco-Uruguay/css/lesson.css
@@ -54,6 +54,7 @@ bottom:0px;
#playAgain {
position: absolute;
+ opacity: 0;
}
#helpScreen{
diff --git a/examples/Conozco-Uruguay/js/lesson.js b/examples/Conozco-Uruguay/js/lesson.js
index f91c5e2..cfd2e7c 100755
--- a/examples/Conozco-Uruguay/js/lesson.js
+++ b/examples/Conozco-Uruguay/js/lesson.js
@@ -53,6 +53,7 @@ $(document).ready(
//Game Control
var isActive = false;
+ var shouldShowHelp = false;
var question = [];
var questions = CAPITALS;
var lastQuestion = '';
@@ -230,15 +231,15 @@ $(document).ready(
var showHelpMessage = function(){
-
+ shouldShowHelp = true;
$('#overlay').css({"position": "absolute",
"background": "white", "opacity": "0.8",
'width': 800, 'height': 500,
- 'display':'', "z-index": 10});
+ 'display':'block', "z-index": 10});
$('#helpScreen').css({"position": "absolute",
"width": "420px", "height": "360px",
'top': '25px', 'left': '20%',
- 'z-index' : 20, 'display':'', "opacity": 1});
+ 'z-index' : 20, 'display':'block', "opacity": 1});
//Chromium HACK: for some reason chromium
//won't let me bind a click event to the #help SVG
@@ -252,14 +253,17 @@ $(document).ready(
//Important u need to hide the playAgain screen too
$('#helpOverlay,#helpScreen')
.bind('click', function(){
- if(!isActive){
+ if (shouldShowHelp === false){
+ return;
+ } else if(!isActive){
$('#overlay,#helpScreen,#playAgain,#helpOverlay')
- .css({"display":"none"});
+ .css({"opacity":0, 'display': 'none'});
isActive = true;
+ shouldShowHelp = false;
askQuestion(questions);
} else {
- $('#overlay,#helpScreen,#helpOverlay,#playAgain')
- .css({"display":"none"});
+ $('#overlay,#helpScreen,#helpOverlay')
+ .css({"opacity":0, 'display': 'none'});
return;
}
});
@@ -267,17 +271,17 @@ $(document).ready(
};
var showPlayAgain = function(){
- $('#overlay').css({"position": "absolute",
- "background": "white", "opacity": "0.8",
- 'width': 800, 'height': 500,
- 'display':'', "z-index": 10});
+ //$('#overlay').css({"position": "absolute",
+ // "background": "white", "opacity": "0.8",
+ // 'width': 800, 'height': 500,
+ // 'display':'', "z-index": 10});
$('#playAgain').css({"position": "absolute",
"width": "420px", "height": "360px",
'top': '25px', 'left': '20%',
- 'z-index' : 20, 'display':'', "opacity": 1});
+ 'z-index' : 22, 'display':'block', "opacity": 1});
var playAgain = function () {
-
+ console.log('inside playagain');
var hideDisplayedItems = function(){
for (var i = 0; i < displayedItems.length; i++){
displayedItems[i].css('display','none');
@@ -287,19 +291,20 @@ $(document).ready(
hideDisplayedItems();
$('#alien').show();
- $('#overlay').css('display', 'none');
$('#playAgain').css('display', 'none');
askQuestion(questions);
};
var quit = function () {
- $('#overlay').css('display', 'none');
- $('#playAgain').css('display', 'none');
+ $('#playAgain').css('opacity', 0);
};
- $('#answerYes', k.svg.playAgain.root).bind('click', playAgain);
- $('#answerNo', k.svg.playAgain.root).bind('click', quit);
+ //jQuery SVG bind doesn't seem to work on chromium
+ $('#answerYes', k.svg.playAgain.root)[0]
+ .addEventListener('click', playAgain, false);
+ $('#answerNo', k.svg.playAgain.root)[0]
+ .addEventListener('click', quit, false);
};