Adding warnings for non-standard escape sequence usage

This commit is contained in:
Jeff Avallone
2014-12-22 16:57:30 -05:00
parent a4f831bc60
commit f842b424cc
9 changed files with 71 additions and 2 deletions
+2
View File
@@ -24,6 +24,8 @@
<div id="error"></div>
<ul id="warnings"></ul>
<!-- NOTE: Do not put anything in #regexp-render other than the <svg> element -->
<div id="regexp-render">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1"></svg>
+6 -1
View File
@@ -9,7 +9,8 @@ export default class Parser {
groupCounter: 1,
renderCounter: 0,
maxCounter: 0,
cancelRender: false
cancelRender: false,
warnings: []
};
}
@@ -58,4 +59,8 @@ export default class Parser {
cancel() {
this.state.cancelRender = true;
}
get warnings() {
return this.state.warnings;
}
}
+5 -1
View File
@@ -41,5 +41,9 @@ export default {
this.elements = _.unique(this.properties.parts.elements, part => {
return [part.type, part.textValue].join(':');
});
if (this.textValue.match(/\\c[^a-zA-Z]/)) {
this.state.warnings.push(`The character set "${this.textValue}" contains the \\c escape followed by a character other than A-Z. This can lead to different behavior depending on browser. The representation here is the most common interpretation.`);
}
}
};
}
+9
View File
@@ -1,6 +1,7 @@
import util from './util.js';
import Parser from './parser/javascript.js';
import Q from 'q';
import _ from 'lodash';
export default class Regexper {
constructor(root) {
@@ -8,6 +9,7 @@ export default class Regexper {
this.form = root.querySelector('#regexp-form');
this.field = root.querySelector('#regexp-input');
this.error = root.querySelector('#error');
this.warnings = root.querySelector('#warnings');
this.permalink = root.querySelector('a[data-glyph="link-intact"]');
this.download = root.querySelector('a[data-glyph="data-transfer-download"]');
this.percentage = root.querySelector('#progress div');
@@ -122,6 +124,12 @@ export default class Regexper {
}
}
displayWarnings(warnings) {
this.warnings.innerHTML = _.map(warnings, warning => {
return `<li class="oi with-text" data-glyph="warning">${warning}</li>`;
}).join('');
}
renderRegexp(expression) {
if (this.runningParser) {
let deferred = Q.defer();
@@ -154,6 +162,7 @@ export default class Regexper {
.then(() => {
this.state = 'has-results';
this.updateLinks();
this.displayWarnings(this.runningParser.warnings);
this._trackEvent('visualization', 'complete');
})
.then(null, message => {
+1
View File
@@ -6,6 +6,7 @@ $light-gray: tint($gray, 25%);
$tan: #cbcbba;
$red: #b3151a;
$blue: #dae9e5;
$yellow: #f8ca00;
$black: #000;
$white: #fff;
+15
View File
@@ -383,6 +383,21 @@ header {
}
}
#warnings {
@include adjust-font-size-to($base-font-size, 1);
font-weight: bold;
background-color: $yellow;
display: none;
li {
margin: rhythm(1/4);
}
body.has-results & {
display: block;
}
}
#regexp-render {
background: $white;
width: 100%;