From: Aleksander Ɓukasz Date: Thu, 24 Oct 2013 08:02:38 +0000 (+0200) Subject: linting & cleaning X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/d61535cf50c7a8cb597db7f1d9681901a06efaa5 linting & cleaning --- diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index 30a53c5..0f6fa20 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -130,7 +130,7 @@ $.extend(WLXMLDocument.prototype, { } else if(where === 'below') { target = next ? $(next) : elParent; key = next ? 'orig_before' : 'orig_end'; - } else { throw new Object;} + } else { throw new Error();} target.data(formatter_prefix + key, toAdd); if(transformed !== undefined) { @@ -139,7 +139,7 @@ $.extend(WLXMLDocument.prototype, { if(original !== undefined) { target.data(formatter_prefix + key + '_original', original); } - } + }; text.transformed = text.trimmed; @@ -171,14 +171,16 @@ $.extend(WLXMLDocument.prototype, { endingWhiteSpace = endingMatch ? endingMatch[0] : null; if(endingWhiteSpace) { - if(text.transformed[text.transformed.length - 1] === ' ' && endingWhiteSpace[0] === ' ') + if(text.transformed[text.transformed.length - 1] === ' ' && endingWhiteSpace[0] === ' ') { endingWhiteSpace = endingWhiteSpace.substr(1); + } addInfo(endingWhiteSpace, 'below', !text.trimmed ? text.transformed : undefined, !text.trimmed ? text.original : undefined); } if(startingWhiteSpace && text.trimmed) { - if(text.transformed[0] === ' ' && startingWhiteSpace[startingWhiteSpace.length-1] === ' ') + if(text.transformed[0] === ' ' && startingWhiteSpace[startingWhiteSpace.length-1] === ' ') { startingWhiteSpace = startingWhiteSpace.substr(0, startingWhiteSpace.length -1); + } addInfo(startingWhiteSpace, 'above', !text.trimmed ? text.transformed : undefined, !text.trimmed ? text.original : undefined); } //} diff --git a/src/wlxml/wlxml.test.js b/src/wlxml/wlxml.test.js index 86fe462..c210a71 100644 --- a/src/wlxml/wlxml.test.js +++ b/src/wlxml/wlxml.test.js @@ -72,6 +72,9 @@ describe('WLXMLDocument', function() { }); describe('formatting output xml', function() { + + /*jshint multistr: true */ + it('keeps white space between XML nodes', function() { var xmlIn = '
\n\n\n
\n\n\n
\n\n\n
', doc = getDocumentFromXML(xmlIn), @@ -90,8 +93,6 @@ describe('WLXMLDocument', function() { var partsIn = xmlIn.split('\n\n\n'), partsOut = xmlOut.split('\n\n\n'); - console.log(xmlIn); - console.log(xmlOut); expect(partsIn).to.deep.equal(partsOut); });