zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleaner tutorial match code, improved page 2 logic

Browse source
This commit is contained in:
Kyle Drake 2016-04-15 15:35:01 -07:00
parent 4f0eb2b82b
commit 10789f46f4
2 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
views/tutorial/html/2.erb
View file

@ -35,46 +35,28 @@
function checkHomework() { function checkHomework() {
var html = editor.getValue() var html = editor.getValue()
var match = '<html>.+</html>'
var re = new XRegExp(match, 'gis') if(!html.tutorialMatches('<html>.+</html>')) {
notok("You're missing the HTML element tag! Your web site must begin with &lt;html&gt; and end with &lt;/html&gt;.")
if(html.match(re) === null) {
notok("You're missing the HTML element tag! Your web site must begin with <html> and end with </html>.")
return return
} }
/*
var match = '<html.+>.+<body></body>.+</html>'
var re = new XRegExp(match, 'gis') if(html.tutorialMatches('Hello World!')) {
if(html.match(re) === null) {
notok("You need to add some text inside the &lt;body&gt;&lt;/body&gt;.")
return
}
*/
var match = 'Hello World'
var re = new XRegExp(match, 'gis')
if(html.match(re) !== null) {
notok("Hint: Try changing \"Hello World\" to something else.") notok("Hint: Try changing \"Hello World\" to something else.")
return return
} }
if(!html.tutorialMatches('<html>.+<body>.+</body>.+</html>')) {
notok('Missing the &lt;body&gt; and/or the &lt;/body&gt; tag.')
return
}
if(html.match(/<body>[\s\n]+<\/body>/) !== null) {
notok('Need to add text between the &lt;body&gt; and the &lt;/body&gt; tags.')
return
}
sessionStorage.setItem('tutorialHtml', html) sessionStorage.setItem('tutorialHtml', html)
ok('Great, you did it!', '/tutorial/html/3') ok('Great, you did it!', '/tutorial/html/3')
/*
var match = '<html.+>.+<body>.+</body>.+</html>'
var re = new XRegExp(match, 'gis')
if(html.match(re) === null) {
notok("That's not right! Try again.")
} else {
sessionStorage.setItem('tutorialHtml', html)
ok('Great, you did it!', '/tutorial/html/3')
}
*/
} }
</script> </script>

12
views/tutorial/layout.erb
View file

@ -80,6 +80,18 @@
<script type="text/javascript"> <script type="text/javascript">
var infoObj = $('.error') var infoObj = $('.error')
String.prototype.tutorialMatches = function(regex, opts) {
if(!opts)
var opts = 'gis'
var result = this.match(new XRegExp(regex, opts))
if(result == null)
return false
return true
}
function notok(msg) { function notok(msg) {
displayInfo('<i class="fa fa-exclamation-triangle"></i> ' + msg, { displayInfo('<i class="fa fa-exclamation-triangle"></i> ' + msg, {
background: '#93771B' background: '#93771B'