Commit Graph

217 Commits

Author SHA1 Message Date
Arsen Melikyan
029cd52e80 Some common code improvements 2015-12-06 13:26:02 +04:00
Quincy Larson
615f553fd2 fix editor height 2015-12-04 21:47:30 -06:00
Berkeley Martinez
3462ba791e Fix camper news submit 2015-12-04 19:23:06 -08:00
Quincy Larson
676ef0e253 finish qa-ing removal of angular 2015-12-04 19:21:19 -06:00
Quincy Larson
7e9d65675a Merge branch 'master' into remove-angular
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Berkeley Martinez
0b42712a1f Fix moving of query behind hash 2015-12-03 17:37:00 -08:00
Berkeley Martinez
b7530253aa Also disable output and tests 2015-12-03 15:09:52 -08:00
Berkeley Martinez
81028fceac Add ability to disable user code on page load
Adding `run=disabled` to the uri will disable the
page from running user code.

This is useful for pages that have frozen to to infinite loops
or untrusted links that may be malicious
2015-12-03 14:57:19 -08:00
Berkeley Martinez
ebfee3ed0a Load jquery from a script tag in iframe 2015-12-03 12:13:25 -08:00
Berkeley Martinez
096fba0de7 Add loop protection on keyup update 2015-12-02 14:56:06 -08:00
Berkeley Martinez
8ec4720345 Patch test text for non conforming tests 2015-12-02 13:04:50 -08:00
Berkeley Martinez
b8d0d78f81 Add delays so firefox can catch up 2015-12-02 11:50:53 -08:00
Berkeley Martinez
0dfb317a38 Remove console.log 2015-12-02 11:50:53 -08:00
Berkeley Martinez
8cad219082 Patch assert messages without message: format 2015-12-02 11:50:53 -08:00
Berkeley Martinez
636824aba3 Display infinite loops to user
Also exits early if infinite loop
2015-12-02 11:50:53 -08:00
Berkeley Martinez
f904f91f97 Actually use loopProtect 2015-12-02 11:50:53 -08:00
Berkeley Martinez
3a299daa37 Add loop-protect
Remove webworkers
2015-12-02 11:50:52 -08:00
Berkeley Martinez
1235077354 Fix don't need to pull jquery from cdn anymore 2015-12-02 11:26:16 -08:00
Arsen Melikyan
d81ad77955 Fix test message position 2015-12-01 22:53:05 +04:00
Logan Tegman
9fb63b954d Merge pull request #4851 from bugron/fix/gist-sharing
Fix gist sharing and some other issues
2015-12-01 09:21:11 -08:00
Logan Tegman
cb56c34af4 Merge pull request #4852 from bugron/fix/codemirror-line-height
Fix CodeMirror class line-height property value
2015-12-01 09:06:51 -08:00
Berkeley Martinez
426526355c Fix initial load error 2015-12-01 08:01:51 -08:00
Berkeley Martinez
aa0297c2f2 Fix editor.getValue not returning the correct code 2015-12-01 08:01:11 -08:00
Arsen Melikyan
a661b05f86 Fix CodeMirror class line-height property value 2015-12-01 14:54:51 +04:00
Arsen Melikyan
2a81a2e887 Fix not working gist sharing 2015-12-01 14:20:45 +04:00
Arsen Melikyan
b5ce9ca6fc Remove a hash symbol from split method 2015-12-01 14:14:12 +04:00
Arsen Melikyan
3b140bc813 Fix issue search query 2015-12-01 14:11:45 +04:00
Berkeley Martinez
574709159d Fix use the document as the proxy for jquery
We proxy the jquery object. This lets us use the jQuery that FCC
uses in the iframe.

Since jQuery sets the context, the main document object or DOM, at script
load, we need to create a proxy with the context of the iframe,
the document object of the iframe.

This was originally set to the body element. But not all challenges
require a body element.
2015-11-30 21:48:28 -08:00
Arsen Melikyan
1543d2b745 Fix challengeTypes object incorrect key names 2015-11-30 18:59:29 +04:00
Berkeley Martinez
0275351490 Increase updatePreview delay 2015-11-29 16:28:32 -08:00
Berkeley Martinez
28e4252a00 Fix errors breaking pipe 2015-11-29 16:28:32 -08:00
Berkeley Martinez
7592131e08 Tell jquery not to execute when getting script 2015-11-29 16:28:32 -08:00
Berkeley Martinez
da67e77fad Fix error logic and output display 2015-11-29 16:28:32 -08:00
Berkeley Martinez
04db6744b9 Fix code output logic
Fix codemirror url paths
2015-11-29 16:28:32 -08:00
Berkeley Martinez
8c261180d3 Fix incorrect logic 2015-11-29 16:28:32 -08:00
Berkeley Martinez
2610573871 Bind to keyup events if editor is present 2015-11-29 16:28:32 -08:00
Berkeley Martinez
ce37991c50 Remove console.logs 2015-11-29 16:28:32 -08:00
Berkeley Martinez
eec7fff909 Fix jQuery challenges 2015-11-29 16:28:32 -08:00
Berkeley Martinez
159b202940 Update preview on keystroke
Also removes need to check for unfinished html comments
2015-11-29 16:28:32 -08:00
Berkeley Martinez
e8d9e31a47 Fix bad ctrl enter logic 2015-11-29 16:28:32 -08:00
Berkeley Martinez
f9bdc32474 Fix editor in iFrame should be the code
This should be changed
2015-11-29 16:28:32 -08:00
Berkeley Martinez
6638412cc3 Preview tests now run correctly
Pulling jQuery from the parent frame
2015-11-29 16:28:32 -08:00
Berkeley Martinez
5a785dbad7 Load iFrame on page load 2015-11-29 16:28:32 -08:00
Berkeley Martinez
6f98f62dd9 Add delay to initial execute 2015-11-29 16:28:32 -08:00
Berkeley Martinez
d2be64cfb5 Add err handling to test run 2015-11-29 16:28:32 -08:00
Berkeley Martinez
83ad2e14eb Save to localStorage/uri on editor key debounce 2015-11-29 16:28:32 -08:00
Berkeley Martinez
fe659b20f4 Submit show completion 2015-11-29 16:28:32 -08:00
Berkeley Martinez
7593dc4e1b Properly display tests 2015-11-29 16:28:32 -08:00
Berkeley Martinez
74fa49cd75 Reset and execute update display and storage 2015-11-29 16:27:14 -08:00
Berkeley Martinez
4bdf1b2854 Add gulp build of commonFramework 2015-11-29 16:27:14 -08:00