[Pkg-javascript-commits] [ltx] 307/469: Tidying code
Jonas Smedegaard
dr at jones.dk
Wed Aug 31 13:03:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository ltx.
commit 91335e392e3942ff92c1cd639277d85d8d10cdbf
Author: Lloyd Watkin <lloyd at evilprofessor.co.uk>
Date: Sun Feb 16 19:53:17 2014 +0000
Tidying code
---
Gruntfile.js | 5 +-
benchmark/benchmark.js | 2 +
benchmark/build.js | 2 +
index.js | 4 +-
lib/element.js | 68 +++++++------
lib/index-browserify.js | 11 ++-
lib/index.js | 19 ++--
lib/parse.js | 34 ++++---
lib/sax_easysax.js | 24 ++---
lib/sax_expat.js | 46 +++++----
lib/sax_ltx.js | 257 ++++++++++++++++++++++++------------------------
lib/sax_node-xml.js | 8 +-
lib/sax_saxjs.js | 58 ++++++-----
test/element-test.js | 8 +-
test/parse-test.js | 8 +-
test/unicode-test.js | 11 ++-
16 files changed, 301 insertions(+), 264 deletions(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index 67327f3..22b4afe 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -24,7 +24,7 @@ module.exports = function(grunt) {
reporter: 'spec',
coverage: 'json'
},
- src: ["test/**/*.js"]
+ src: ['test/**/*.js']
}
}
})
@@ -37,6 +37,5 @@ module.exports = function(grunt) {
// Configure tasks
grunt.registerTask('default', ['test'])
- // grunt.registerTask('test', ['clean', 'vows', 'jshint', 'browserify'])
- grunt.registerTask('test', ['clean', 'vows', 'browserify'])
+ grunt.registerTask('test', ['clean', 'vows', 'jshint', 'browserify'])
}
diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js
index b725272..3bcb968 100644
--- a/benchmark/benchmark.js
+++ b/benchmark/benchmark.js
@@ -1,3 +1,5 @@
+'use strict';
+
if (process.title === 'browser') {
var ltx = require("ltx");
var strophe = require('Strophe.js');
diff --git a/benchmark/build.js b/benchmark/build.js
index 8fd00cd..2aac8be 100644
--- a/benchmark/build.js
+++ b/benchmark/build.js
@@ -1,3 +1,5 @@
+'use strict';
+
var browserify = require('browserify');
var path = require('path');
var b = browserify({
diff --git a/index.js b/index.js
index bf4d18a..97f8296 100644
--- a/index.js
+++ b/index.js
@@ -1 +1,3 @@
-module.exports = require('./lib/index.js');
+'use strict';
+
+module.exports = require('./lib/index.js')
\ No newline at end of file
diff --git a/lib/element.js b/lib/element.js
index 5425515..790e79e 100644
--- a/lib/element.js
+++ b/lib/element.js
@@ -1,3 +1,5 @@
+'use strict';
+
/**
* This cheap replica of DOM/Builder puts me to shame :-)
*
@@ -17,8 +19,8 @@ function Element(name, attrs) {
* if (element.is('message', 'jabber:client')) ...
**/
Element.prototype.is = function(name, xmlns) {
- return this.getName() == name &&
- (!xmlns || this.getNS() == xmlns)
+ return (this.getName() === name) &&
+ (!xmlns || (this.getNS() === xmlns))
}
/* without prefix */
@@ -108,10 +110,10 @@ Element.prototype.getChild = function(name, xmlns) {
Element.prototype.getChildren = function(name, xmlns) {
var result = []
for (var i = 0; i < this.children.length; i++) {
- var child = this.children[i]
+ var child = this.children[i]
if (child.getName &&
- child.getName() == name &&
- (!xmlns || child.getNS() == xmlns))
+ (child.getName() === name) &&
+ (!xmlns || (child.getNS() === xmlns)))
result.push(child)
}
return result
@@ -130,13 +132,14 @@ Element.prototype.getChildByAttr = function(attr, val, xmlns, recursive) {
Element.prototype.getChildrenByAttr = function(attr, val, xmlns, recursive) {
var result = []
for (var i = 0; i < this.children.length; i++) {
- var child = this.children[i]
+ var child = this.children[i]
if (child.attrs &&
- child.attrs[attr] == val &&
- (!xmlns || child.getNS() == xmlns))
+ (child.attrs[attr] === val) &&
+ (!xmlns || (child.getNS() === xmlns)))
result.push(child)
- if (recursive && child.getChildrenByAttr)
+ if (recursive && child.getChildrenByAttr) {
result.push(child.getChildrenByAttr(attr, val, xmlns, true))
+ }
}
if (recursive) result = [].concat.apply([], result)
return result
@@ -152,8 +155,8 @@ Element.prototype.getChildrenByFilter = function(filter, recursive) {
result.push(child.getChildrenByFilter(filter, true))
}
}
- if (recursive){
- result = [].concat.apply([], result)
+ if (recursive) {
+ result = [].concat.apply([], result)
}
return result
}
@@ -161,9 +164,10 @@ Element.prototype.getChildrenByFilter = function(filter, recursive) {
Element.prototype.getText = function() {
var text = ''
for (var i = 0; i < this.children.length; i++) {
- var child = this.children[i]
- if ((typeof child === 'string') || (typeof child === 'number'))
+ var child = this.children[i]
+ if ((typeof child === 'string') || (typeof child === 'number')) {
text += child
+ }
}
return text
}
@@ -219,16 +223,16 @@ Element.prototype.t = function(text) {
Element.prototype.remove = function(el, xmlns) {
var filter
if (typeof el === 'string') {
- /* 1st parameter is tag name */
- filter = function(child) {
- return !(child.is &&
- child.is(el, xmlns))
- }
+ /* 1st parameter is tag name */
+ filter = function(child) {
+ return !(child.is &&
+ child.is(el, xmlns))
+ }
} else {
- /* 1st parameter is element */
- filter = function(child) {
- return child !== el
- }
+ /* 1st parameter is element */
+ filter = function(child) {
+ return child !== el
+ }
}
this.children = this.children.filter(filter)
@@ -248,14 +252,14 @@ Element.prototype.clone = function() {
clone.attrs[k] = this.attrs[k]
}
for (var i = 0; i < this.children.length; i++) {
- var child = this.children[i]
- clone.cnode(child.clone ? child.clone() : child)
+ var child = this.children[i]
+ clone.cnode(child.clone ? child.clone() : child)
}
return clone
}
Element.prototype.text = function(val) {
- if (val && this.children.length == 1){
+ if (val && this.children.length === 1) {
this.children[0] = val
return this
}
@@ -263,9 +267,9 @@ Element.prototype.text = function(val) {
}
Element.prototype.attr = function(attr, val) {
- if ((!(typeof val === 'undefined') || (val === null))) {
- if (!this.attrs){
- this.attrs = {}
+ if (((typeof val !== 'undefined') || (val === null))) {
+ if (!this.attrs) {
+ this.attrs = {}
}
this.attrs[attr] = val
return this
@@ -288,15 +292,15 @@ Element.prototype.write = function(writer) {
writer(this.name)
for (var k in this.attrs) {
var v = this.attrs[k]
- if (v || (v === '') || (v === 0)) {
- writer(' ')
+ if (v || (v === '') || (v === 0)) {
+ writer(' ')
writer(k)
writer('="')
if (typeof v !== 'string')
- v = v.toString(10)
+ v = v.toString(10)
writer(escapeXml(v))
writer('"')
- }
+ }
}
if (this.children.length === 0) {
writer('/>')
diff --git a/lib/index-browserify.js b/lib/index-browserify.js
index 915e7d8..bdc9699 100644
--- a/lib/index-browserify.js
+++ b/lib/index-browserify.js
@@ -1,8 +1,9 @@
+'use strict';
+
/* Cause browserify to bundle SAX parsers: */
-//require('./sax_easysax');
-//require('./sax_saxjs');
-var parse = require('./parse');
-parse.availableSaxParsers.push(parse.bestSaxParser = require('./sax_ltx'));
+var parse = require('./parse')
+
+parse.availableSaxParsers.push(parse.bestSaxParser = require('./sax_ltx'))
/* SHIM */
-module.exports = require('./index');
+module.exports = require('./index')
\ No newline at end of file
diff --git a/lib/index.js b/lib/index.js
index 68de945..334afe9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,22 +1,25 @@
-var element = require('./element');
-var parse = require('./parse');
+'use strict';
+
+var element = require('./element')
+ , parse = require('./parse')
/**
* The only (relevant) data structure
*/
-exports.Element = element.Element;
+exports.Element = element.Element
/**
* Helper
*/
-exports.escapeXml = element.escapeXml;
+exports.escapeXml = element.escapeXml
/**
* DOM parser interface
*/
-exports.parse = parse.parse;
-exports.Parser = parse.Parser;
+exports.parse = parse.parse
+exports.Parser = parse.Parser
+
/**
* SAX parser interface
*/
-exports.availableSaxParsers = parse.availableSaxParsers;
-exports.bestSaxParser = parse.bestSaxParser;
+exports.availableSaxParsers = parse.availableSaxParsers
+exports.bestSaxParser = parse.bestSaxParser
diff --git a/lib/parse.js b/lib/parse.js
index 29cdfb1..690a7ca 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -1,21 +1,23 @@
-var events = require('events');
-var util = require('util');
+'use strict';
+
+var events = require('events')
+ , util = require('util')
exports.availableSaxParsers = [];
exports.bestSaxParser = null;
['./sax_expat.js', './sax_ltx.js', /*'./sax_easysax.js', './sax_node-xml.js',*/ './sax_saxjs.js'].forEach(function(modName) {
var mod;
try {
- mod = require(modName);
+ mod = require(modName);
} catch (e) {
- /* Silently missing libraries drop; for debug:
- console.error(e.stack || e);
- */
+ /* Silently missing libraries drop; for debug:
+ console.error(e.stack || e);
+ */
}
if (mod) {
- exports.availableSaxParsers.push(mod);
- if (!exports.bestSaxParser)
- exports.bestSaxParser = mod;
+ exports.availableSaxParsers.push(mod);
+ if (!exports.bestSaxParser)
+ exports.bestSaxParser = mod;
}
});
var element = require('./element');
@@ -26,7 +28,7 @@ exports.Parser = function(saxParser) {
var parserMod = saxParser || exports.bestSaxParser;
if (!parserMod)
- throw new Error("No SAX parser available");
+ throw new Error("No SAX parser available");
this.parser = new parserMod();
var el;
@@ -55,8 +57,8 @@ exports.Parser = function(saxParser) {
el.t(str);
});
this.parser.addListener('error', function(e) {
- that.error = e;
- that.emit('error', e);
+ that.error = e;
+ that.emit('error', e);
});
};
util.inherits(exports.Parser, events.EventEmitter);
@@ -69,10 +71,10 @@ exports.Parser.prototype.end = function(data) {
this.parser.end(data);
if (!this.error) {
- if (this.tree)
- this.emit('tree', this.tree);
- else
- this.emit('error', new Error('Incomplete document'));
+ if (this.tree)
+ this.emit('tree', this.tree);
+ else
+ this.emit('error', new Error('Incomplete document'));
}
};
diff --git a/lib/sax_easysax.js b/lib/sax_easysax.js
index 71231cb..9ccdd4e 100644
--- a/lib/sax_easysax.js
+++ b/lib/sax_easysax.js
@@ -1,22 +1,24 @@
-var util = require('util');
-var events = require('events');
-var Easysax = require('easysax');
+'use strict';
+
+var util = require('util')
+ , events = require('events')
+ , Easysax = require('easysax')
/**
* FIXME: This SAX parser cannot be pushed to!
*/
-module.exports = SaxEasysax;
-util.inherits(SaxEasysax, events.EventEmitter);
+module.exports = SaxEasysax
+util.inherits(SaxEasysax, events.EventEmitter)
function SaxEasysax() {
- events.EventEmitter.call(this);
- this.parser = new Easysax();
+ events.EventEmitter.call(this)
+ this.parser = new Easysax()
- var that = this;
+ var that = this
this.parser.on('startNode', function(name, attr, uq, istagend) {
- attr = attr();
+ attr = attr()
if (attr === false) {
that.emit('error', 'attr char');
@@ -42,9 +44,9 @@ function SaxEasysax() {
that.emit('error', e);
});
// TODO: other events, esp. entityDecl (billion laughs!)
-
+
var sbuffer = '';
-
+
this.write = function(data) {
sbuffer += typeof data !== 'string' ? data.toString() : data;
};
diff --git a/lib/sax_expat.js b/lib/sax_expat.js
index 9d05cb2..bea432e 100644
--- a/lib/sax_expat.js
+++ b/lib/sax_expat.js
@@ -1,39 +1,43 @@
-var util = require('util');
-var events = require('events');
-var expat = require('node-expat');
+'use strict';
+
+var util = require('util')
+ , events = require('events')
+ , expat = require('node-expat')
var SaxExpat = module.exports = function SaxExpat() {
- events.EventEmitter.call(this);
- this.parser = new expat.Parser('UTF-8');
+ events.EventEmitter.call(this)
+ this.parser = new expat.Parser('UTF-8')
var that = this;
this.parser.on('startElement', function(name, attrs) {
- that.emit('startElement', name, attrs);
- });
+ that.emit('startElement', name, attrs)
+ })
this.parser.on('endElement', function(name) {
- that.emit('endElement', name);
- });
+ that.emit('endElement', name)
+ })
this.parser.on('text', function(str) {
- that.emit('text', str);
- });
+ that.emit('text', str)
+ })
// TODO: other events, esp. entityDecl (billion laughs!)
-};
-util.inherits(SaxExpat, events.EventEmitter);
+}
+
+util.inherits(SaxExpat, events.EventEmitter)
SaxExpat.prototype.write = function(data) {
if (!this.parser.parse(data, false)) {
- this.emit('error', new Error(this.parser.getError()));
+ this.emit('error', new Error(this.parser.getError()))
// Premature error thrown,
// disable all functionality:
- this.write = function() { };
- this.end = function() { };
+ this.write = function() { }
+ this.end = function() { }
}
};
SaxExpat.prototype.end = function(data) {
- if (!this.parser.parse('', true))
- this.emit('error', new Error(this.parser.getError()));
- else
- this.emit('end');
-};
+ if (!this.parser.parse('', true)) {
+ this.emit('error', new Error(this.parser.getError()))
+ } else {
+ this.emit('end')
+ }
+}
\ No newline at end of file
diff --git a/lib/sax_ltx.js b/lib/sax_ltx.js
index be1577f..e9019b2 100644
--- a/lib/sax_ltx.js
+++ b/lib/sax_ltx.js
@@ -1,5 +1,7 @@
-var util = require('util');
-var events = require('events');
+'use strict'
+
+var util = require('util')
+ , events = require('events')
var STATE_TEXT = 0,
STATE_IGNORE_TAG = 1,
@@ -8,147 +10,148 @@ var STATE_TEXT = 0,
STATE_ATTR_NAME = 4,
STATE_ATTR_EQ = 5,
STATE_ATTR_QUOT = 6,
- STATE_ATTR_VALUE = 7;
+ STATE_ATTR_VALUE = 7
var RE_TAG_NAME = /^[^\s\/>]+$/,
- RE_ATTR_NAME = /^[^\s=]+$/;
+ RE_ATTR_NAME = /^[^\s=]+$/
var SaxLtx = module.exports = function SaxLtx() {
- events.EventEmitter.call(this);
+ events.EventEmitter.call(this)
- var state = STATE_TEXT, remainder;
- var tagName, attrs, endTag, selfClosing, attrQuote;
- var recordStart = 0;
- var attrName;
+ var state = STATE_TEXT, remainder
+ var tagName, attrs, endTag, selfClosing, attrQuote
+ var recordStart = 0
+ var attrName
this.write = function(data) {
- if (typeof data !== 'string')
- data = data.toString();
+ if (typeof data !== 'string') {
+ data = data.toString()
+ }
var pos = 0
- /* Anything from previous write()? */
- if (remainder) {
- data = remainder + data;
- pos += remainder.length;
- delete remainder;
- }
-
- function endRecording() {
- if (typeof recordStart === 'number') {
- var recorded = data.slice(recordStart, pos);
- recordStart = undefined;
- return recorded;
- }
- }
-
- for(; pos < data.length; pos++) {
- var c = data.charCodeAt(pos);
- //console.log("state", state, "c", c, data[pos]);
- switch(state) {
- case STATE_TEXT:
- if (c === 60 /* < */) {
- var text = endRecording();
- if (text)
- this.emit('text', unescapeXml(text));
- state = STATE_TAG_NAME;
- recordStart = pos + 1;
- attrs = {};
- }
- break;
- case STATE_TAG_NAME:
- if (c === 47 /* / */ && recordStart === pos) {
- recordStart = pos + 1;
- endTag = true;
- } else if (c === 33 /* ! */ || c === 63 /* ? */) {
- recordStart = undefined;
- state = STATE_IGNORE_TAG;
- } else if (c <= 32 || c === 47 /* / */ || c === 62 /* > */) {
- tagName = endRecording();
- pos--;
- state = STATE_TAG;
- }
- break;
- case STATE_IGNORE_TAG:
- if (c === 62 /* > */) {
- state = STATE_TEXT;
- }
- break;
- case STATE_TAG:
- if (c === 62 /* > */) {
- if (!endTag) {
- this.emit('startElement', tagName, attrs);
- if (selfClosing)
- this.emit('endElement', tagName);
- } else
- this.emit('endElement', tagName);
- tagName = undefined;
- attrs = undefined;
- endTag = undefined;
- selfClosing = undefined;
- state = STATE_TEXT;
- recordStart = pos + 1;
- } else if (c === 47 /* / */) {
- selfClosing = true;
- } else if (c > 32) {
- recordStart = pos;
- state = STATE_ATTR_NAME;
- }
- break;
- case STATE_ATTR_NAME:
- if (c <= 32 || c === 61 /* = */) {
- attrName = endRecording();
- pos--;
- state = STATE_ATTR_EQ;
- }
- break;
- case STATE_ATTR_EQ:
- if (c === 61 /* = */) {
- state = STATE_ATTR_QUOT;
- }
- break;
- case STATE_ATTR_QUOT:
- if (c === 34 /* " */ || c === 39 /* ' */) {
- attrQuote = c;
- state = STATE_ATTR_VALUE;
- recordStart = pos + 1;
- }
- break;
- case STATE_ATTR_VALUE:
- if (c === attrQuote) {
- var value = unescapeXml(endRecording());
- attrs[attrName] = value;
- attrName = undefined;
- state = STATE_TAG;
- }
- break;
- }
- }
-
- if (typeof recordStart === 'number' &&
- recordStart <= data.length) {
-
- remainder = data.slice(recordStart);
- recordStart = 0;
- }
- };
-
- /*var origEmit = this.emit;
+ /* Anything from previous write()? */
+ if (remainder) {
+ data = remainder + data
+ pos += remainder.length
+ delete remainder
+ }
+
+ function endRecording() {
+ if (typeof recordStart === 'number') {
+ var recorded = data.slice(recordStart, pos)
+ recordStart = undefined
+ return recorded
+ }
+ }
+
+ for(; pos < data.length; pos++) {
+ var c = data.charCodeAt(pos)
+ //console.log("state", state, "c", c, data[pos])
+ switch(state) {
+ case STATE_TEXT:
+ if (c === 60 /* < */) {
+ var text = endRecording()
+ if (text)
+ this.emit('text', unescapeXml(text))
+ state = STATE_TAG_NAME
+ recordStart = pos + 1
+ attrs = {}
+ }
+ break
+ case STATE_TAG_NAME:
+ if (c === 47 /* / */ && recordStart === pos) {
+ recordStart = pos + 1
+ endTag = true
+ } else if (c === 33 /* ! */ || c === 63 /* ? */) {
+ recordStart = undefined
+ state = STATE_IGNORE_TAG
+ } else if (c <= 32 || c === 47 /* / */ || c === 62 /* > */) {
+ tagName = endRecording()
+ pos--
+ state = STATE_TAG
+ }
+ break
+ case STATE_IGNORE_TAG:
+ if (c === 62 /* > */) {
+ state = STATE_TEXT
+ }
+ break
+ case STATE_TAG:
+ if (c === 62 /* > */) {
+ if (!endTag) {
+ this.emit('startElement', tagName, attrs)
+ if (selfClosing)
+ this.emit('endElement', tagName)
+ } else
+ this.emit('endElement', tagName)
+ tagName = undefined
+ attrs = undefined
+ endTag = undefined
+ selfClosing = undefined
+ state = STATE_TEXT
+ recordStart = pos + 1
+ } else if (c === 47 /* / */) {
+ selfClosing = true
+ } else if (c > 32) {
+ recordStart = pos
+ state = STATE_ATTR_NAME
+ }
+ break
+ case STATE_ATTR_NAME:
+ if (c <= 32 || c === 61 /* = */) {
+ attrName = endRecording()
+ pos--
+ state = STATE_ATTR_EQ
+ }
+ break
+ case STATE_ATTR_EQ:
+ if (c === 61 /* = */) {
+ state = STATE_ATTR_QUOT
+ }
+ break
+ case STATE_ATTR_QUOT:
+ if (c === 34 /* " */ || c === 39 /* ' */) {
+ attrQuote = c
+ state = STATE_ATTR_VALUE
+ recordStart = pos + 1
+ }
+ break
+ case STATE_ATTR_VALUE:
+ if (c === attrQuote) {
+ var value = unescapeXml(endRecording())
+ attrs[attrName] = value
+ attrName = undefined
+ state = STATE_TAG
+ }
+ break
+ }
+ }
+
+ if (typeof recordStart === 'number' &&
+ recordStart <= data.length) {
+
+ remainder = data.slice(recordStart)
+ recordStart = 0
+ }
+ }
+
+ /*var origEmit = this.emit
this.emit = function() {
- console.log('ltx', arguments);
- origEmit.apply(this, arguments);
- };*/
-};
-util.inherits(SaxLtx, events.EventEmitter);
+ console.log('ltx', arguments)
+ origEmit.apply(this, arguments)
+ }*/
+}
+util.inherits(SaxLtx, events.EventEmitter)
SaxLtx.prototype.end = function(data) {
if (data)
- this.write(data);
+ this.write(data)
/* Uh, yeah */
this.write = function() {
- };
-};
+ }
+}
function unescapeXml(s) {
return s.
@@ -156,5 +159,5 @@ function unescapeXml(s) {
replace(/\</g, '<').
replace(/\>/g, '>').
replace(/\"/g, '"').
- replace(/\'/g, '\'');
+ replace(/\'/g, '\'')
}
diff --git a/lib/sax_node-xml.js b/lib/sax_node-xml.js
index 16c64cc..18d03a0 100644
--- a/lib/sax_node-xml.js
+++ b/lib/sax_node-xml.js
@@ -1,6 +1,8 @@
-var util = require('util');
-var events = require('events');
-var xml = require('node-xml');
+'use strict';
+
+var util = require('util')
+ , events = require('events')
+ , xml = require('node-xml')
/**
* This cannot be used as long as node-xml starts parsing only after
diff --git a/lib/sax_saxjs.js b/lib/sax_saxjs.js
index 1a27b6e..7a268eb 100644
--- a/lib/sax_saxjs.js
+++ b/lib/sax_saxjs.js
@@ -1,39 +1,45 @@
-var util = require('util');
-var events = require('events');
-var sax = require('sax');
+'use strict';
+
+var util = require('util')
+ , events = require('events')
+ , sax = require('sax')
var SaxSaxjs = module.exports = function SaxSaxjs() {
- events.EventEmitter.call(this);
- this.parser = sax.parser(true);
- var that = this;
+ events.EventEmitter.call(this)
+ this.parser = sax.parser(true)
+
+ var that = this
this.parser.onopentag = function(a) {
- that.emit('startElement', a.name, a.attributes);
- };
+ that.emit('startElement', a.name, a.attributes)
+ }
this.parser.onclosetag = function(name) {
- that.emit('endElement', name);
- };
+ that.emit('endElement', name)
+ }
this.parser.ontext = function(str) {
- that.emit('text', str);
- };
+ that.emit('text', str)
+ }
this.parser.onend = function() {
- that.emit('end');
- };
+ that.emit('end')
+ }
this.parser.onerror = function(e) {
- that.emit('error', e);
- };
+ that.emit('error', e)
+ }
// TODO: other events, esp. entityDecl (billion laughs!)
-};
-util.inherits(SaxSaxjs, events.EventEmitter);
+}
+
+util.inherits(SaxSaxjs, events.EventEmitter)
SaxSaxjs.prototype.write = function(data) {
- if (typeof data !== 'string')
- data = data.toString();
- this.parser.write(data);
-};
+ if (typeof data !== 'string') {
+ data = data.toString()
+ }
+ this.parser.write(data)
+}
SaxSaxjs.prototype.end = function(data) {
- if (data)
- this.parser.write(data);
- this.parser.close();
-};
+ if (data) {
+ this.parser.write(data)
+ }
+ this.parser.close()
+}
\ No newline at end of file
diff --git a/test/element-test.js b/test/element-test.js
index 22ed9f4..8123e0f 100644
--- a/test/element-test.js
+++ b/test/element-test.js
@@ -1,6 +1,8 @@
-var vows = require('vows'),
-assert = require('assert'),
-ltx = require('./../lib/index');
+'use strict';
+
+var vows = require('vows')
+ , assert = require('assert')
+ , ltx = require('./../lib/index')
vows.describe('ltx').addBatch({
'serialization': {
diff --git a/test/parse-test.js b/test/parse-test.js
index d4e2192..1118d32 100644
--- a/test/parse-test.js
+++ b/test/parse-test.js
@@ -1,6 +1,8 @@
-var vows = require('vows'),
-assert = require('assert'),
-ltx = require('./../lib/index');
+'use strict';
+
+var vows = require('vows')
+ , assert = require('assert')
+ , ltx = require('./../lib/index')
ltx.availableSaxParsers.forEach(function(saxParser) {
var parse = function(s) {
diff --git a/test/unicode-test.js b/test/unicode-test.js
index 27e38dc..3cca616 100644
--- a/test/unicode-test.js
+++ b/test/unicode-test.js
@@ -1,3 +1,5 @@
+'use strict';
+
var vows = require('vows')
, assert = require('assert')
, Element = require('../lib/element').Element
@@ -21,12 +23,11 @@ vows.describe('unicode').addBatch({
},
*/
'issue-29 test #3': function() {
- var text = '니코드<'
- var element = new Element(
+ var text = '니코드<'
+ var element = new Element(
'message', { to: 'you at server.com', type: 'chat' }
- )
- .c('body').t('니코드<'.toString('utf8'))
- assert.equal(element.getText(), text)
+ ).c('body').t('니코드<'.toString('utf8'))
+ assert.equal(element.getText(), text)
},
'issue-29 test write': function() {
var text = '유니코드'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/ltx.git
More information about the Pkg-javascript-commits
mailing list