Skip to content

Commit

Permalink
Merged
Browse files Browse the repository at this point in the history
  • Loading branch information
@nwinter
nwinter committed Nov 2, 2017
2 parents 6ca220d + c827310 commit cacabba
Show file tree
Hide file tree
Showing 337 changed files with 20,886 additions and 7,031 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
View file
@@ -0,0 +1,3 @@
{
"registry": "https://registry.bower.io"
}
5 changes: 4 additions & 1 deletion .travis.yml
View file
Expand Up @@ -4,7 +4,10 @@ node_js:
- 5.1.1
env:
- CXX=g++-4.8
services:
- mongodb
addons:
firefox: "55.0"
apt:
sources:
- mongodb-upstart
Expand Down Expand Up @@ -42,4 +45,4 @@ notifications:
on_failure: always
on_start: never
on_pull_requests: false
dist: precise
dist: trusty
106 changes: 53 additions & 53 deletions README.md
View file
Expand Up @@ -2,7 +2,7 @@

<div style="text-align:center">
<a href="http://codecombat.com/">
<img src ="https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/readme_00.png" />
<img src ="https://s3.amazonaws.com/files.codecombat.com/wiki-images/readme_00.png" />
</a>
</div>

Expand Down Expand Up @@ -52,57 +52,57 @@ so we can accept your pull requests. It is easy.
![Scott Erickson](http://codecombat.com/images/pages/about/team-avatars/scott-avatar.png "Scott Erickson")
![Matt Lott](http://codecombat.com/images/pages/about/team-avatars/matt-avatar.png "Matt Lott")
![Catherine Weresow](http://codecombat.com/images/pages/about/team-avatars/cat-avatar.png "Catherine Weresow")
![Maka Gradin](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Maka%20Gradin/maka_gradin_100.png "Maka Gradin")
![Rob Blanckaert](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Rob%20Blanckaert/rob_blanckaert_100.png "Rob Blanckaert")
![Josh Callebaut](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Josh%20Callebaut/josh_callebaut_100.png "Josh Callebaut")
![Maka Gradin](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Maka%20Gradin/maka_gradin_100.png "Maka Gradin")
![Rob Blanckaert](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Rob%20Blanckaert/rob_blanckaert_100.png "Rob Blanckaert")
![Josh Callebaut](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Josh%20Callebaut/josh_callebaut_100.png "Josh Callebaut")
![Michael Schmatz](http://codecombat.com/images/pages/about/michael_small.png "Michael Schmatz")
![Josh Lee](http://codecombat.com/images/pages/about/josh_small.png "Josh Lee")
![Dan TDM](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Dan_TDM/dan_tdm_100.png "Dan TDM")
![Alex Cotsarelis](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Alex%20Cotsarelis/alex_100.png "Alex Cotsarelis")
![Alex Crooks](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Alex%20Crooks/alex_100.png "Alex Crooks")
![Alexandru Caciulescu](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Alexandru%20Caciulescu/alexandru_100.png "Alexandru Caciulescu")
![Andreas Linn](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Andreas%20Linn/andreas_100.png "Andreas Linn")
![Andrew Witcher](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Andrew%20Witcher/andrew_100.png "Andrew Witcher")
![Axandre Oge](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Axandre%20Oge/axandre_100.png "Axandre Oge")
![Bang Honam](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Bang%20Honam/bang_100.png "Bang Honam")
![Benjamin Stern](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Benjamin%20Stern/benjamin_100.png "Benjamin Stern")
![Brad Dickason](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Brad%20Dickason/brad_100.png "Brad Dickason")
![Carlos Maia](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Carlos%20Maia/carlos_maia_100.png "Carlos Maia")
![Chloe Fan](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Chloe%20Fan/chloe_100.png "Chloe Fan")
![Dan Ristic](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Dan%20Ristic/dan_100.png "Dan Ristic")
![Danny Whittaker](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Danny%20Whittaker/danny_100.png "Danny Whittaker")
![David Liu](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/David%20Liu/david_liu_100.png "David Liu")
![David Pendray](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/David%20Pendray/david_100.png "David Pendray")
![Deepak1556](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Deepak1556/deepak_100.png "Deepak1556")
![Derek Wong](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Derek%20Wong/derek_100.png "Derek Wong")
![Dominik Kundel](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Dominik%20Kundel/dominik_k_100.png "Dominik Kundel")
![Glen De Cauwsemaecker](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Glen%20de%20Cauwsemaecker/glen_100.png "Glen De Cauwsemaecker")
![Ian Li](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Ian%20Li/ian_100.png "Ian Li")
![Jeremy Arns](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Jeremy%20Arns/jeremy_100.png "Jeremy Arns")
![Joachim Brehmer](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Joachim%20Brehmer/joachim_100.png "Joachim Brehmer")
![Jose Antonini](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Jose%20Antonini/jose_antonini_100.png "Jose Antonini")
![Katharine Chan](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Katharine%20Chan/katharine_100.png "Katharine Chan")
![Ken Stanley](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Ken%20Stanley/ken_100.png "Ken Stanley")
![Kevin Holland](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Kevin%20Holland/kevin_100.png "Kevin Holland")
![Laura Watiker](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Laura%20Watiker/laura_100.png "Laura Watiker")
![Michael Heasell](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Michael%20Heasell/michael_100.png "Michael Heasell")
![Michael Polyak](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Michael%20Polyak/michael_100.png "Michael Polyak")
![Mischa Lewis-Norelle](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Mischa%20Lewis-Norelle/mischa_100.png "Mischa Lewis-Norelle")
![Nathan Gosset](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Nathan%20Gosset/nathan_100.png "Nathan Gosset")
![Oleg Ulyanicky](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Oleg%20Ulyanickiy/oleg_100.png "Oleg Ulyanicky")
![Paul Buser](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Paul%20Buser/paul_100.png "Paul Buser")
![Pavel Konstantynov](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Pavel%20Konstantinov/pavel_100.png "Pavel Konstantynov")
![Popey Gilbert](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Popey%20Gilbert/popey_100.png "Popey Gilbert")
![Prabhsimran Baweja](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Prabhsimran%20Baweja/prabhsimran_100.png "Prabhsimran Baweja")
![Rachel Xiang](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Rachel%20Xiang/rachel_100.png "Rachel Xiang")
![Rebecca Saines](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Rebecca%20Saines/rebecca_100.png "Rebecca Saines")
![Robert Moreton](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Robert%20Moreton/robert_100.png "Robert Moreton")
![Ronnie Cheng](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Ronnie%20Cheng/ronnie_100.png "Ronnie Cheng")
![Ruben Vereecken](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Ruben%20Vereecken/ruben_100.png "Ruben Vereecken")
![Russ Fan](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Russ%20Fan/russ_100.png "Russ Fan")
![Shiying Zheng](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Shying%20Zheng/shiyeng_100.png "Shiying Zheng")
![Sébastien Moratinos](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Tom%20Steinbrecher/tom_100.png "Sébastien Moratinos")
![Thanish Muhammed](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Thanish%20Muhammed/thanish_100.png "Thanish Muhammed")
![Tom Steinbrecher](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Tom%20Steinbrecher/tom_100.png "Tom Steinbrecher")
![Yang Shun Tay](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Yang%20Shun%20Tay/yang_shun_tay_100.png "Yang Shun Tay")
![Zach Martin](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Zach%20Martin/zack_100.png "Zach Martin")
![Dan TDM](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Dan_TDM/dan_tdm_100.png "Dan TDM")
![Alex Cotsarelis](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Alex%20Cotsarelis/alex_100.png "Alex Cotsarelis")
![Alex Crooks](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Alex%20Crooks/alex_100.png "Alex Crooks")
![Alexandru Caciulescu](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Alexandru%20Caciulescu/alexandru_100.png "Alexandru Caciulescu")
![Andreas Linn](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Andreas%20Linn/andreas_100.png "Andreas Linn")
![Andrew Witcher](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Andrew%20Witcher/andrew_100.png "Andrew Witcher")
![Axandre Oge](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Axandre%20Oge/axandre_100.png "Axandre Oge")
![Bang Honam](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Bang%20Honam/bang_100.png "Bang Honam")
![Benjamin Stern](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Benjamin%20Stern/benjamin_100.png "Benjamin Stern")
![Brad Dickason](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Brad%20Dickason/brad_100.png "Brad Dickason")
![Carlos Maia](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Carlos%20Maia/carlos_maia_100.png "Carlos Maia")
![Chloe Fan](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Chloe%20Fan/chloe_100.png "Chloe Fan")
![Dan Ristic](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Dan%20Ristic/dan_100.png "Dan Ristic")
![Danny Whittaker](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Danny%20Whittaker/danny_100.png "Danny Whittaker")
![David Liu](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/David%20Liu/david_liu_100.png "David Liu")
![David Pendray](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/David%20Pendray/david_100.png "David Pendray")
![Deepak1556](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Deepak1556/deepak_100.png "Deepak1556")
![Derek Wong](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Derek%20Wong/derek_100.png "Derek Wong")
![Dominik Kundel](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Dominik%20Kundel/dominik_k_100.png "Dominik Kundel")
![Glen De Cauwsemaecker](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Glen%20de%20Cauwsemaecker/glen_100.png "Glen De Cauwsemaecker")
![Ian Li](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Ian%20Li/ian_100.png "Ian Li")
![Jeremy Arns](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Jeremy%20Arns/jeremy_100.png "Jeremy Arns")
![Joachim Brehmer](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Joachim%20Brehmer/joachim_100.png "Joachim Brehmer")
![Jose Antonini](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Jose%20Antonini/jose_antonini_100.png "Jose Antonini")
![Katharine Chan](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Katharine%20Chan/katharine_100.png "Katharine Chan")
![Ken Stanley](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Ken%20Stanley/ken_100.png "Ken Stanley")
![Kevin Holland](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Kevin%20Holland/kevin_100.png "Kevin Holland")
![Laura Watiker](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Laura%20Watiker/laura_100.png "Laura Watiker")
![Michael Heasell](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Michael%20Heasell/michael_100.png "Michael Heasell")
![Michael Polyak](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Michael%20Polyak/michael_100.png "Michael Polyak")
![Mischa Lewis-Norelle](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Mischa%20Lewis-Norelle/mischa_100.png "Mischa Lewis-Norelle")
![Nathan Gosset](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Nathan%20Gosset/nathan_100.png "Nathan Gosset")
![Oleg Ulyanicky](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Oleg%20Ulyanickiy/oleg_100.png "Oleg Ulyanicky")
![Paul Buser](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Paul%20Buser/paul_100.png "Paul Buser")
![Pavel Konstantynov](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Pavel%20Konstantinov/pavel_100.png "Pavel Konstantynov")
![Popey Gilbert](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Popey%20Gilbert/popey_100.png "Popey Gilbert")
![Prabhsimran Baweja](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Prabhsimran%20Baweja/prabhsimran_100.png "Prabhsimran Baweja")
![Rachel Xiang](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Rachel%20Xiang/rachel_100.png "Rachel Xiang")
![Rebecca Saines](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Rebecca%20Saines/rebecca_100.png "Rebecca Saines")
![Robert Moreton](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Robert%20Moreton/robert_100.png "Robert Moreton")
![Ronnie Cheng](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Ronnie%20Cheng/ronnie_100.png "Ronnie Cheng")
![Ruben Vereecken](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Ruben%20Vereecken/ruben_100.png "Ruben Vereecken")
![Russ Fan](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Russ%20Fan/russ_100.png "Russ Fan")
![Shiying Zheng](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Shying%20Zheng/shiyeng_100.png "Shiying Zheng")
![Sébastien Moratinos](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Tom%20Steinbrecher/tom_100.png "Sébastien Moratinos")
![Thanish Muhammed](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Thanish%20Muhammed/thanish_100.png "Thanish Muhammed")
![Tom Steinbrecher](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Tom%20Steinbrecher/tom_100.png "Tom Steinbrecher")
![Yang Shun Tay](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Yang%20Shun%20Tay/yang_shun_tay_100.png "Yang Shun Tay")
![Zach Martin](https://s3.amazonaws.com/files.codecombat.com/wiki-images/avatars/Zach%20Martin/zack_100.png "Zach Martin")
Binary file modified app/assets/images/pages/about/new_languages.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/pages/about/new_languages_xs.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/about/team-avatars/david-avatar.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/about/team-avatars/jane-avatar.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/about/team-headshots/david-headshot.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/about/team-headshots/jane-headshot.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/home/video_thumb.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/pages/modal/auth/facebook_sso_button.png
View file
Binary file not shown.
Binary file added app/assets/images/pages/modal/auth/facebook_sso_button2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/pages/modal/auth/gplus_sso_button.png
View file
Binary file not shown.
Binary file added app/assets/images/pages/modal/auth/gplus_sso_button2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/play/amazon_horz_lockup.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/play/amazon_vert_lockup.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/play/aws-educate-logo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/play/duck_anya.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/play/duck_tharin.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/play/future-engineer-logo.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/play/modal/heroes-and-pets.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/play/modal/three-pets.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/teachers/resources/markdown/compression-grass.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/teachers/resources/markdown/compression-high-res.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/teachers/resources/markdown/compression-low-res.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pages/teachers/resources/markdown/compression-wood-x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 40 additions & 3 deletions app/assets/javascripts/web-dev-listener.js
View file
Expand Up @@ -4,7 +4,13 @@ var lastSource = null;
var lastOrigin = null;
window.onerror = function(message, url, line, column, error){
console.log("User script error on line " + line + ", column " + column + ": ", error);
lastSource.postMessage({ type: 'error', message: message, url: url, line: line, column: column }, lastOrigin);
lastSource.postMessage({
type: 'error',
message: message,
url: url,
line: line || 0,
column: column || 0,
}, lastOrigin);
}
window.addEventListener('message', receiveMessage, false);

Expand All @@ -19,7 +25,8 @@ var createFailed;

var allowedOrigins = [
/^https?:\/\/(.*\.)?codecombat\.com$/,
/^https?:\/\/localhost:3000$/,
/^https?:\/\/localhost:[\d]+$/, // For local development
/^https?:\/\/10.0.2.2:[\d]+$/, // For local virtual machines
/^https?:\/\/coco\.code\.ninja$/,
/^https?:\/\/.*codecombat-staging-codecombat\.runnableapp\.com$/,
];
Expand Down Expand Up @@ -80,10 +87,40 @@ function create(options) {
createFailed = true;
$('.loading-message').addClass('hidden')
$('.loading-error').removeClass('hidden')
throw(e);
const errPos = parseStackTrace(e.stack);
lastSource.postMessage({
type: 'error',
message: e.name+": "+e.message,
line: errPos.line,
column: errPos.column,
}, lastOrigin);
}
}

function parseStackTrace(trace) {
const lines = trace.split('\n')
const regexes = [
/.*?at .*? \(eval at globalEval.*?\).*?,.*?(\d+):(\d+)\)$/, // Chrome stacktrace formatting
/@.*eval:(\d+):(\d+)$/, // Firefox stacktrace formatting
/at eval code \(eval code:(\d+):(\d+)\)$/, // Internet Explorer stacktrace formatting
// Safari doesn't include line numbers for eval in stack trace
]
var matchedLine;
for (var i = 0; i < regexes.length; i++) {
var regex = regexes[i];
matchedLine = _.find(lines, function(line) {
return regex.test(line)
})
if (!matchedLine) continue;
const match = matchedLine.match(regex);
return {
line: Number(match[1]),
column: Number(match[2]),
}
}
if (!matchedLine) return { line: 0, column: 0 };
}

function unwrapConcreteNodes(wrappedNodes) {
return wrappedNodes.children;
}
Expand Down

0 comments on commit cacabba

Please sign in to comment.