jprdonnelly/freeCodeCamp
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2026-02-26 17:01:40 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
Quincy Larson
2015-08-14 17:29:28 -07:00
parent aed4b6bfe1 326c22276d
commit 2bbad67141
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/main.less
View File

@@ -743,8 +743,8 @@ form.code span {
}
.scroll-locker {
overflow-x: auto;
overflow-y: scroll;
overflow-x: hidden;
overflow-y: auto;
}
.big-error-icon {

4
public/js/main_0.0.3.js
View File

@@ -359,6 +359,10 @@ $(document).ready(function() {
}
});
function defCheck(a){
if(a !== 'undefined'){return(true);}else{return(false);}
}
var profileValidation = angular.module('profileValidation',
['ui.bootstrap']);
profileValidation.controller('profileValidationController', ['$scope', '$http',

2
seed/challenges/basic-javascript.json
View File

@@ -1571,7 +1571,7 @@
"difficulty":"9.9901",
"description":[
"Now that we can detect when the player wins we are going to add an image to each slot depending on the random values we generate",
"<code>$($('.slot')[0]).html('&lt;img src = \"' + images[slotOne-1] + '\"&gt;');<code>"
"<code>$($('.slot')[0]).html('&lt;img src = \"' + images[slotOne-1] + '\"&gt;');</code>"
],
"tests":[
"assert(editor.match(/\\$\\(\\$\\(\\'\\.slot\\'\\)\\[\\d\\]\\)\\.html\\(\\'\\<img\\s?src\\s?=\\s?\"\\'\\s?\\+\\s?images\\[\\w+\\-1\\]\\s?\\+\\s?\\'\"\\>\\'\\);/gi) && editor.match(/\\$\\(\\$\\(\\'\\.slot\\'\\)\\[\\d\\]\\)\\.html\\(\\'\\<img\\s?src\\s?=\\s?\"\\'\\s?\\+\\s?images\\[\\w+\\-1\\]\\s?\\+\\s?\\'\"\\>\\'\\);/gi).length >= 3, 'Use the provided code three times. One for each slot');",