diff --git a/.gitattributes b/.gitattributes index b26c13c..9645d1e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,11 +5,12 @@ .gitignore export-ignore .eslintrc.json export-ignore .jshintignore export-ignore -.jshintrc +.jshintrc export-ignore .travis.yml export-ignore +.appveyor.yml export-ignore bower.json Gruntfile.js export-ignore -performance.* +performance.* export-ignore # Line endings control CHANGELOG.md text diff --git a/.travis.yml b/.travis.yml index 5f7752b..abd8932 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ language: node_js node_js: + - "0.12" - "4.0" - "6.0" before_install: - - npm update npm -g + - 'if [ "$TRAVIS_NODE_VERSION" !== "0.12" ]; then npm update npm -g; fi' - npm install -g grunt-cli #travis build speed up diff --git a/dist/showdown.js b/dist/showdown.js index c111e93..15bc079 100644 Binary files a/dist/showdown.js and b/dist/showdown.js differ diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 789dcb7..cd24e4f 100644 Binary files a/dist/showdown.min.js and b/dist/showdown.min.js differ diff --git a/package.json b/package.json index 91192fd..14b6ec6 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ "grunt-endline": "^0.6.1", "grunt-eslint": "^19.0.0", "grunt-simple-mocha": "^0.4.0", - "js-beautify": "^1.5.6", "load-grunt-tasks": "^3.2.0", "performance-now": "^2.0.0", "quiet-grunt": "^0.2.3", diff --git a/test/bootstrap.js b/test/bootstrap.js index 048efad..6519dc1 100644 --- a/test/bootstrap.js +++ b/test/bootstrap.js @@ -9,15 +9,6 @@ require('source-map-support').install(); require('chai').should(); var fs = require('fs'); - /* - os = require('os'), - beautify = require('js-beautify').html_beautify, - beauOptions = { - eol: os.EOL, - indent_size: 2, - preserve_newlines: false - }; - */ function getTestSuite (dir) { return fs.readdirSync(dir)