root
/
regexper-static
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trapping errors in URL formatting and displaying an error message

This commit is contained in:
Jeff Avallone 2015-01-19 10:15:34 -05:00
parent 66b3c76f9a
commit 80e96c7bd3
2 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
spec/regexper_spec.js
View File

@ -23,7 +23,8 @@ describe('regexper.js', function() {
this.regexper = new Regexper(this.root);
spyOn(this.regexper, '_setHash');
spyOn(this.regexper, '_getHash').and.returnValue('example hash value');
spyOn(this.regexper, '_getHash');
spyOn(window._gaq, 'push');
});
describe('#keypressListener', function() {
@ -179,15 +180,42 @@ describe('regexper.js', function() {
describe('#hashchangeListener', function() {
it('enables the permalink', function() {
this.regexper.hashchangeListener();
expect(this.regexper.permalinkEnabled).toEqual(true);
describe('when the URL is invalid', function() {
beforeEach(function() {
this.regexper._getHash.and.returnValue(new Error('example error'));
});
it('displays an error message', function() {
this.regexper.hashchangeListener();
expect(this.regexper.state).toEqual('has-error');
expect(this.regexper.error.innerHTML).toEqual('Malformed expression in URL');
});
it('tracks the event', function() {
this.regexper.hashchangeListener();
expect(window._gaq.push).toHaveBeenCalledWith(['_trackEvent', 'visualization', 'malformed URL']);
});
});
it('shows the expression from the hash', function() {
spyOn(this.regexper, 'showExpression');
this.regexper.hashchangeListener();
expect(this.regexper.showExpression).toHaveBeenCalledWith('example hash value');
describe('when the URL is valid', function() {
beforeEach(function() {
this.regexper._getHash.and.returnValue('example hash value');
});
it('enables the permalink', function() {
this.regexper.hashchangeListener();
expect(this.regexper.permalinkEnabled).toEqual(true);
});
it('shows the expression from the hash', function() {
spyOn(this.regexper, 'showExpression');
this.regexper.hashchangeListener();
expect(this.regexper.showExpression).toHaveBeenCalledWith('example hash value');
});
});
});
@ -352,7 +380,6 @@ describe('regexper.js', function() {
spyOn(Parser.prototype, 'render').and.returnValue(this.renderPromise.promise);
spyOn(Parser.prototype, 'cancel');
spyOn(window._gaq, 'push');
spyOn(this.regexper, 'updateLinks');
spyOn(this.regexper, 'displayWarnings');
});

19
src/js/regexper.js
View File

@ -53,8 +53,16 @@ export default class Regexper {
}
hashchangeListener() {
this.permalinkEnabled = true;
this.showExpression(this._getHash());
var expr = this._getHash();
if (expr instanceof Error) {
this.state = 'has-error';
this.error.innerHTML = 'Malformed expression in URL';
window._gaq.push(['_trackEvent', 'visualization', 'malformed URL']);
} else {
this.permalinkEnabled = true;
this.showExpression(expr);
}
}
bindListeners() {
@ -69,7 +77,12 @@ export default class Regexper {
}
_getHash() {
return decodeURIComponent(location.hash.slice(1));
try {
return decodeURIComponent(location.hash.slice(1));
}
catch(e) {
return e;
}
}
set state(state) {