From c35fde061df7652a1043e3bf85baa84404fa8c27 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sat, 22 Aug 2015 22:51:48 +0100 Subject: [PATCH 1/3] Fixed help modal part 2 --- public/js/main_0.0.3.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/main_0.0.3.js b/public/js/main_0.0.3.js index cd126faaf6..a22435b898 100644 --- a/public/js/main_0.0.3.js +++ b/public/js/main_0.0.3.js @@ -62,8 +62,8 @@ $(document).ready(function() { $('.close-modal').unbind('click'); $('.close-modal').on('click', function(){ setTimeout(function() { - $('#issue-modal').modal('hide'); - }, 2000); + $('#help-modal').modal('hide'); + }, 200); }); $('#report-issue').unbind('click'); From e87913edad7c6cb421b330b39b4b269a7064a2a7 Mon Sep 17 00:00:00 2001 From: Abhisek Pattnaik Date: Sun, 23 Aug 2015 03:22:05 +0530 Subject: [PATCH 2/3] Fix Add your JavaScript Slot Machine Instructions --- seed/challenges/basic-javascript.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 687b271a4f..d12c94a6f3 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -1277,8 +1277,8 @@ "description":[ "Now that our slots will each generate random numbers, we need to check whether they've all returned the same number.", "If they have, we should notify our user that they've won.", - "Otherwise, we should return null, which is a JavaScript data structure that means nothing.", - "If all three numbers match, we should change the value of win to the number that we have three of or leave it as null.", + "Otherwise, we should return null, which is a JavaScript literal representing null or an "empty" value, i.e. no object value is present.", + "If all three numbers match, we should return the number that we have in three of slots or leave it as null.", "Let's create an if statement with multiple conditions in order to check whether all numbers are equal.", "if(slotOne !== slotTwo || slotTwo !== slotThree){", "  return(null);", From 3b6da88e7f2a7faa55c1944489cb501d5f7bd814 Mon Sep 17 00:00:00 2001 From: Abhisek Pattnaik Date: Sun, 23 Aug 2015 03:26:20 +0530 Subject: [PATCH 3/3] Fix error in string --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index d12c94a6f3..5ee5ee83d7 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -1277,7 +1277,7 @@ "description":[ "Now that our slots will each generate random numbers, we need to check whether they've all returned the same number.", "If they have, we should notify our user that they've won.", - "Otherwise, we should return null, which is a JavaScript literal representing null or an "empty" value, i.e. no object value is present.", + "Otherwise, we should return null, which is a JavaScript literal representing null or an \"empty\" value, i.e. no object value is present.", "If all three numbers match, we should return the number that we have in three of slots or leave it as null.", "Let's create an if statement with multiple conditions in order to check whether all numbers are equal.", "if(slotOne !== slotTwo || slotTwo !== slotThree){",