gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
terakilobyte
2015-05-28 14:14:05 -04:00
parent 72505915f8 131b9ad1b7
commit 28f1efaab1
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js → public/js/lib/coursewares/coursewaresHCJQFramework_0.1.6.js
View File

@@ -51,7 +51,7 @@ var libraryIncludes = "<script src='//ajax.googleapis.com/ajax/libs/jquery/2.1.3
var editorValueForIFrame;
var iFrameScript = "<script src='/js/lib/coursewares/iFrameScripts_0.0.3.js'></script>";
var iFrameScript = "<script src='/js/lib/coursewares/iFrameScripts_0.0.4.js'></script>";
var delay;
// Initialize CodeMirror editor with a nice html5 canvas demo.

0
public/js/lib/coursewares/iFrameScripts_0.0.3.js → public/js/lib/coursewares/iFrameScripts_0.0.4.js
View File

12
seed_data/challenges/basic-html5-and-css.json
View File

@@ -143,7 +143,7 @@
"",
"<h2>CatPhotoApp</h2>",
"",
"<br/>",
"<br>",
"",
"<p>Hello Paragraph</p>",
"-->"
@@ -180,7 +180,7 @@
"",
"<h2>CatPhotoApp</h2>",
"",
"<br/>",
"<br>",
"",
"<p>Hello Paragraph</p>",
"-->"
@@ -216,7 +216,7 @@
"",
"<h2>CatPhotoApp</h2>",
"",
"<br/>",
"<br>",
"",
"<p>Hello Paragraph</p>"
],
@@ -252,7 +252,7 @@
"",
"<h2>CatPhotoApp</h2>",
"",
"<br/>",
"<br>",
"",
"<p>Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.</p>"
],
@@ -1103,7 +1103,7 @@
],
"tests": [
"expect($('a').children('img').length, 'Wrap your image element inside an anchor element that has its <code>href</code> attribute set to \"#\"').to.equal(1);",
"expect(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Make sure to specify the \"src\" attritube as \"#\"').to.be.true;"
"expect(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Make sure to specify the \"src\" attribute as \"#\"').to.be.true;"
],
"challengeSeed": [
"<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1425,7 +1425,7 @@
"name": "Waypoint: Add Placeholder Text to a Text Field",
"difficulty": 0.039,
"description": [
"Add the placeholder text \"type a cat photo URL here\" to your text field.",
"Add the placeholder text \"cat photo URL\" to your text field.",
"Placeholder text will appear in your text field before your user has inputed anything.",
"For example: <code>&#60;input type='text' placeholder='this is placeholder text'&#62;</code>"
],

10
seed_data/field-guides.json
View File

@@ -292,13 +292,16 @@
" <li><a href='https://www.facebook.com/groups/free.code.camp.baltimore.md/' target='_blank'>Baltimore</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.bandung/' target='_blank'>Bandung</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.belgrade/' target='_blank'>Belgrade</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.bellingham/' target='_blank'>Bellingham</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.bengaluru/' target='_blank'>Bengaluru</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.berkeley/' target='_blank'>Berkeley</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.berlin/' target='_blank'>Berlin</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.bhaktapur/' target='_blank'>Bhaktapur</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.bismarck.north.dakota/' target='_blank'>Bismarck, ND</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.bogota/' target='_blank'>Bogota</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.boston/' target='_blank'>Boston</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.boulder/' target='_blank'>Boulder</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.bratislava/' target='_blank'>Bratislava</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.brussels/' target='_blank'>Brussels</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.buenos.aires/' target='_blank'>Buenos Aires</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.bucharest/' target='_blank'>Bucharest</a></li>",
@@ -307,6 +310,7 @@
" <li><a href='https://www.facebook.com/groups/free.code.camp.calgary/' target='_blank'>Calgary</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.campinas/' target='_blank'>Campinas</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.cape.town/' target='_blank'>Cape Town</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.caracas/' target='_blank'>Caracas</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.charlotte.nc/' target='_blank'>Charlotte</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.chennai/' target='_blank'>Chennai</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.chicago/' target='_blank'>Chicago</a></li>",
@@ -318,6 +322,7 @@
" <li><a href='https://www.facebook.com/groups/free.code.camp.dallas/' target='_blank'>Dallas</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.delhi/' target='_blank'>Delhi</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.denver/' target='_blank'>Denver</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.dhaka/' target='_blank'>Dhaka</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.doha/' target='_blank'>Doha</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.dubai/' target='_blank'>Dubai</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.edmonton/' target='_blank'>Edmonton</a></li>",
@@ -336,9 +341,12 @@
" <li><a href='https://www.facebook.com/groups/free.code.camp.iasi.romania/' target='_blank'>Iasi</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.irkutsk/' target='_blank'>Irkutsk</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.islamabad/' target='_blank'>Islamabad</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.hamptonroads/' target='_blank'>Hampton Roads</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.hochiminhcity/' target='_blank'>Ho Chi Minh City</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.hyderabad/' target='_blank'>Hyderabad</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.kaduna/' target='_blank'>Kaduna</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.kalamazoo/' target='_blank'>Kalamazoo</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.kansascity/' target='_blank'>Kansas City</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.karachi/' target='_blank'>Karachi</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.kathmandu/' target='_blank'>Kathmandu</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.kemerovo/' target='_blank'>Kemerovo</a></li>",
@@ -346,6 +354,7 @@
" <li><a href='https://www.facebook.com/groups/free.code.camp.kolkata/' target='_blank'>Kolkata</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.krasnodar/' target='_blank'>Krasnodar</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.kryvyi.rih/' target='_blank'>Kryvyi Rih</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.lagos/' target='_blank'>Lagos</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.lahore/' target='_blank'>Lahore</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.limassol/' target='_blank'>Limassol</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.london/' target='_blank'>London</a></li>",
@@ -355,6 +364,7 @@
" <li><a href='https://www.facebook.com/groups/free.code.camp.minneapolis/' target='_blank'>Minneapolis</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.missoula/' target='_blank'>Missoula</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.montreal/' target='_blank'>Montreal</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.moscow/' target='_blank'>Moscow</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.munich/' target='_blank'>Munich</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.mysore/' target='_blank'>Mysore</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.nairobi/' target='_blank'>Nairobi</a></li>",

2
views/coursewares/showHTML.jade
View File

@@ -91,4 +91,4 @@ block content
.animated.zoomInDown.delay-half
span.completion-icon.ion-checkmark-circled.text-primary
a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js")
script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.6.js")