ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00
Code Issues Releases Wiki Activity

Finalize ReactError component

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-12-07 11:48:28 +01:00
parent 0a67766aba
commit 3ce63c33bf
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_detail/edition_container.js
View File

@ -55,7 +55,7 @@ let EditionContainer = React.createClass({
const { editionError } = this.state;
if(editionError && editionError.status === 404) {
this.throws(new ResourceNotFoundError(getLangText('Oops, the edition you\'re looking for doesn\'t exist.')));
this.throws(new ResourceNotFoundError(getLangText("Oops, the edition you're looking for doesn't exist.")));
}
},

2
js/components/ascribe_detail/piece_container.js
View File

@ -86,7 +86,7 @@ let PieceContainer = React.createClass({
const { pieceError } = this.state;
if(pieceError && pieceError.status === 404) {
this.throws(new ResourceNotFoundError(getLangText('Oops, the piece you\'re looking for doesn\'t exist.')));
this.throws(new ResourceNotFoundError(getLangText("Oops, the piece you're looking for doesn't exist.")));
}
},

2
js/components/error_not_found_page.js
View File

@ -12,7 +12,7 @@ let ErrorNotFoundPage = React.createClass({
getDefaultProps() {
return {
message: getLangText('Oops, the page you are looking for does not exist.')
message: getLangText("Oops, the page you are looking for doesn't exist.")
};
},

9
js/mixins/react_error.js
View File

@ -4,9 +4,12 @@ import invariant from 'invariant';
const ReactError = {
throws(err) {
invariant(err.handler, 'Error thrown to ReactError did not have a `handler` function');
console.logGlobal('Error thrown to ReactError did not have a `handler` function');
err.handler(this, err);
if(!err.handler) {
invariant(err.handler, 'Error thrown to ReactError did not have a `handler` function');
console.logGlobal('Error thrown to ReactError did not have a `handler` function');
} else {
err.handler(this, err);
}
}
};

4
js/models/errors.js
View File

@ -19,9 +19,7 @@ export class ResourceNotFoundError extends Error {
}
handler(component, err) {
const { displayName } = component.constructor;
const monkeyPatchedKey = typeof displayName === 'string' ? `_${displayName}MonkeyPatched`
: '_monkeyPatched';
const monkeyPatchedKey = `_${this.name}MonkeyPatched`;
if(!component.state[monkeyPatchedKey]) {
component.render = () => <ErrorNotFoundPage message={err.message} />;