Skip to content
This repository has been archived by the owner on Jun 6, 2018. It is now read-only.

Commit

Permalink
Fixing lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
javallone committed Nov 1, 2015
1 parent e35be73 commit 966ab5f
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 41 deletions.
2 changes: 1 addition & 1 deletion config.js
Expand Up @@ -26,6 +26,6 @@ module.exports = {
lintRoots: ['lib', 'src', 'spec'],
browserify: {
debug: true,
fullPaths: false,
fullPaths: false
}
};
7 changes: 3 additions & 4 deletions gulpfile.js
Expand Up @@ -120,12 +120,11 @@ gulp.task('scripts', function() {
sourcemaps = require('gulp-sourcemaps'),
rename = require('gulp-rename');

var b = browserify(config.browserify)
return browserify(config.browserify)
.transform(require('./lib/canopy-transform'))
.transform(require('babelify'))
.add('./src/js/main.js');

return b.bundle()
.add('./src/js/main.js')
.bundle()
.on('error', notify.onError())
.pipe(source('./src/js/main.js'))
.pipe(buffer())
Expand Down
4 changes: 2 additions & 2 deletions lib/canopy-transform.js
Expand Up @@ -2,12 +2,12 @@ var through = require('through'),
canopy = require('canopy');

module.exports = function(file) {
var data = '';

if (!/\.peg$/.test(file)) {
return through();
}

var data = '';

return through(
function(buf) {
data += buf;
Expand Down
2 changes: 1 addition & 1 deletion spec/parser/javascript/match_spec.js
Expand Up @@ -25,7 +25,7 @@ describe('parser/javascript/match.js', function() {
jasmine.objectContaining({
content: jasmine.objectContaining({ literal: 'example' })
})
],
]
},
'example$': {
anchorStart: false,
Expand Down
48 changes: 25 additions & 23 deletions spec/parser/javascript/node_spec.js
Expand Up @@ -30,7 +30,9 @@ describe('parser/javascript/node.js', function() {
this.node.module = {
definedProperties: {
example: {
get: function() { return 'value'; }
get: function() {
return 'value';
}
}
}
};
Expand Down Expand Up @@ -77,28 +79,28 @@ describe('parser/javascript/node.js', function() {
describe('#getBBox', function() {

it('returns the normalized bbox of the container merged with the anchor', function() {
this.node.proxy = {
anchor: {
anchor: 'example anchor'
}
};
this.node.container = jasmine.createSpyObj('container', ['addClass', 'getBBox']);
this.node.container.getBBox.and.returnValue({
bbox: 'example bbox',
x: 'left',
x2: 'right',
cy: 'center'
});
expect(this.node.getBBox()).toEqual({
bbox: 'example bbox',
anchor: 'example anchor',
x: 'left',
x2: 'right',
cy: 'center',
ax: 'left',
ax2: 'right',
ay: 'center'
});
this.node.proxy = {
anchor: {
anchor: 'example anchor'
}
};
this.node.container = jasmine.createSpyObj('container', ['addClass', 'getBBox']);
this.node.container.getBBox.and.returnValue({
bbox: 'example bbox',
x: 'left',
x2: 'right',
cy: 'center'
});
expect(this.node.getBBox()).toEqual({
bbox: 'example bbox',
anchor: 'example anchor',
x: 'left',
x2: 'right',
cy: 'center',
ax: 'left',
ax2: 'right',
ay: 'center'
});
});

});
Expand Down
2 changes: 1 addition & 1 deletion spec/parser/javascript_spec.js
Expand Up @@ -123,7 +123,7 @@ describe('parser/javascript.js', function() {
it('sets the dimensions of the image', function(done) {
this.parser.render()
.then(() => {
var svg = this.container.querySelector('svg');
let svg = this.container.querySelector('svg');

expect(svg.getAttribute('width')).toEqual('62');
expect(svg.getAttribute('height')).toEqual('44');
Expand Down
2 changes: 1 addition & 1 deletion spec/regexper_spec.js
Expand Up @@ -17,7 +17,7 @@ describe('regexper.js', function() {
'</form>',
'<div id="error"></div>',
'<ul id="warnings"></ul>',
'<div id="regexp-render"></div>',
'<div id="regexp-render"></div>'
].join('');

this.regexper = new Regexper(this.root);
Expand Down
2 changes: 1 addition & 1 deletion src/js/main.js
Expand Up @@ -44,7 +44,7 @@ window._gaq = (typeof _gaq !== 'undefined') ? _gaq : {
// Initialize the main page of the site. Functionality is kept in the
// [Regexper class](./regexper.html).
if (document.body.querySelector('#content .application')) {
var regexper = new Regexper(document.body);
let regexper = new Regexper(document.body);

regexper.detectBuggyHash();
regexper.bindListeners();
Expand Down
2 changes: 1 addition & 1 deletion src/js/parser/javascript.js
Expand Up @@ -84,7 +84,7 @@ export default class Parser {
// Once rendering is complete, the rendered expression is positioned and
// the SVG resized to create some padding around the image contents.
.then(result => {
var box = result.getBBox();
let box = result.getBBox();

result.transform(Snap.matrix()
.translate(10 - box.x, 10 - box.y));
Expand Down
2 changes: 1 addition & 1 deletion src/js/parser/javascript/literal.js
Expand Up @@ -10,7 +10,7 @@ export default {
_render() {
return this.renderLabel(['\u201c', this.literal, '\u201d'])
.then(label => {
var spans = label.selectAll('tspan');
let spans = label.selectAll('tspan');

// The quote marks get some styling to lighten their color so they are
// distinct from the actual literal value.
Expand Down
2 changes: 1 addition & 1 deletion src/js/parser/javascript/match_fragment.js
Expand Up @@ -29,7 +29,7 @@ export default {
_render() {
return this.content.render(this.container.group())
.then(() => {
var box, paths;
let box, paths;

// Contents must be transformed based on the repeat that is applied.
this.content.transform(this.repeat.contentPosition);
Expand Down
4 changes: 2 additions & 2 deletions src/js/parser/javascript/node.js
Expand Up @@ -121,7 +121,7 @@ export default class Node {

return this.deferredStep()
.then(() => {
var box = text.getBBox(),
let box = text.getBBox(),
margin = 5;

text.transform(Snap.matrix()
Expand Down Expand Up @@ -161,7 +161,7 @@ export default class Node {

return this.deferredStep()
.then(() => {
var labelBox = label.getBBox(),
let labelBox = label.getBBox(),
contentBox = content.getBBox();

label.transform(Snap.matrix()
Expand Down
2 changes: 1 addition & 1 deletion src/js/parser/javascript/regexp.js
Expand Up @@ -19,7 +19,7 @@ export default {
return match.render(matchContainer.group());
}))
.then(() => {
var containerBox,
let containerBox,
paths;

// Space matches vertically in the match container.
Expand Down
2 changes: 1 addition & 1 deletion src/js/parser/javascript/root.js
Expand Up @@ -24,7 +24,7 @@ export default {
// Render the content of the regular expression.
return this.regexp.render(this.container.group())
.then(() => {
var box;
let box;

// Move rendered regexp to account for flag label and to allow for
// decorative elements.
Expand Down

0 comments on commit 966ab5f

Please sign in to comment.