Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 94 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"extends": "eslint:recommended",
"env": {
"node": true
},
"globals": {
"describe": true,
"it": true
},
"rules": {
"eqeqeq": 2,
"no-extend-native": 2,
"no-use-before-define": [
2,
{
"functions": false,
"classes": false
}
],
"no-caller": 2,
"no-irregular-whitespace": 2,
"quotes": [
2,
"double"
],
"no-undef": 2,
"no-unused-vars": 2,
"no-eq-null": 2,
"no-proto": 2,
"curly": [
2,
"multi-line"
],
"no-mixed-spaces-and-tabs": [
2,
"smart-tabs"
],
"space-infix-ops": 2,
"keyword-spacing": [
2,
{
"overrides": {
"if": {
"after": false
},
"catch": {
"after": false
},
"for": {
"after": false
},
"while": {
"after": false
}
}
}
],
"new-cap": 2,
"comma-style": [
2,
"last"
],
"dot-notation": 2,
"wrap-iife": 2,
"no-empty": 2,
"space-unary-ops": [
2,
{
"words": false,
"nonwords": false
}
],
"no-with": 2,
"no-multi-str": 2,
"no-trailing-spaces": 2,
"indent": [
2,
"tab",
{
"SwitchCase": 1,
"VariableDeclarator": 0
}
],
"linebreak-style": [
2,
"unix"
],
"consistent-this": [
2,
"_this"
],
"no-extra-semi": 0 // https://github.com/eslint/eslint/issues/6386
}
}
29 changes: 0 additions & 29 deletions .jscsrc

This file was deleted.

6 changes: 3 additions & 3 deletions lib/FeedHandler.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var index = require("./index.js"),
DomHandler = index.DomHandler,
DomUtils = index.DomUtils;
DomUtils = index.DomUtils;

//TODO: make this a streamable handler
function FeedHandler(callback, options){
Expand Down Expand Up @@ -34,8 +34,8 @@ var isValidFeed = function(value){

FeedHandler.prototype.onend = function(){
var feed = {},
feedRoot = getOneElement(isValidFeed, this.dom),
tmp, childs;
feedRoot = getOneElement(isValidFeed, this.dom),
tmp, childs;

if(feedRoot){
if(feedRoot.name === "feed"){
Expand Down
3 changes: 2 additions & 1 deletion lib/Parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ function Parser(cbs, options){
this._lowerCaseAttributeNames = "lowerCaseAttributeNames" in this._options ?
!!this._options.lowerCaseAttributeNames :
!this._options.xmlMode;
if(!!this._options.Tokenizer) {

if(this._options.Tokenizer) {
Tokenizer = this._options.Tokenizer;
}
this._tokenizer = new Tokenizer(this._options, this);
Expand Down
30 changes: 5 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"lcov": "istanbul cover _mocha --report lcovonly -- -R spec",
"coveralls": "npm run lint && npm run lcov && (cat coverage/lcov.info | coveralls || exit 0)",
"test": "mocha && npm run lint",
"lint": "jshint lib test && jscs lib test"
"lint": "eslint lib test"
},
"dependencies": {
"domelementtype": "^1.3.0",
Expand All @@ -44,33 +44,13 @@
},
"devDependencies": {
"coveralls": "^2.11.4",
"istanbul": "^0.3.18",
"jscs": "^2.1.0",
"jshint": "^2.8.0",
"istanbul": "^0.4.3",
"mocha": "^2.2.5",
"mocha-lcov-reporter": "^0.0.2"
"eslint": "^2.12.0",
"mocha-lcov-reporter": "^1.2.0"
},
"browser": {
"readable-stream": false
},
"license": "MIT",
"jshintConfig": {
"eqeqeq": true,
"freeze": true,
"latedef": "nofunc",
"noarg": true,
"nonbsp": true,
"quotmark": "double",
"undef": true,
"unused": true,
"trailing": true,
"eqnull": true,
"proto": true,
"smarttabs": true,
"node": true,
"globals": {
"describe": true,
"it": true
}
}
"license": "MIT"
}
6 changes: 3 additions & 3 deletions test/02-stream.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var helper = require("./test-helper.js"),
Stream = require("..").WritableStream,
fs = require("fs"),
path = require("path");
Stream = require("..").WritableStream,
fs = require("fs"),
path = require("path");

helper.mochaTest("Stream", __dirname, function(test, cb){
var filePath = path.join(__dirname, "Documents", test.file);
Expand Down
6 changes: 3 additions & 3 deletions test/03-feed.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//Runs tests for feeds

var helper = require("./test-helper.js"),
FeedHandler = require("..").RssHandler,
fs = require("fs"),
path = require("path");
FeedHandler = require("..").RssHandler,
fs = require("fs"),
path = require("path");

helper.mochaTest("Feeds", __dirname, function(test, cb){
fs.readFile(
Expand Down
4 changes: 2 additions & 2 deletions test/test-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ var htmlparser2 = require(".."),
fs = require("fs"),
path = require("path"),
assert = require("assert"),
Parser = htmlparser2.Parser,
CollectingHandler = htmlparser2.CollectingHandler;
Parser = htmlparser2.Parser,
CollectingHandler = htmlparser2.CollectingHandler;

exports.writeToParser = function(handler, options, data){
var parser = new Parser(handler, options);
Expand Down