Skip to content

Commit db371b5

Browse files
committed
prepare release 1.0.0
1 parent 22537b8 commit db371b5

21 files changed

Lines changed: 94 additions & 164 deletions

.editorconfig

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[*.js]
2-
indent_style = space;
3-
indent_size = 2;
4-
continuation_indent_size = 2;
5-
insert_final_newline = true;
6-
quote_type = single;
7-
space_after_anonymous_functions = true;
8-
space_after_control_statements = true;
9-
spaces_around_operators = true;
10-
trim_trailing_whitespace = true;
11-
spaces_in_brackets = false;
12-
curly_bracket_next_line = true;
13-
indent_brace_style = 1TBS;
14-
end_of_line = lf;
15-
charset = utf-8;
2+
indent_style = space
3+
indent_size = 2
4+
continuation_indent_size = 2
5+
insert_final_newline = true
6+
quote_type = single
7+
space_after_anonymous_functions = true
8+
space_after_control_statements = true
9+
spaces_around_operators = true
10+
trim_trailing_whitespace = true
11+
spaces_in_brackets = false
12+
curly_bracket_next_line = true
13+
indent_brace_style = 1TBS
14+
end_of_line = lf
15+
charset = utf-8

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ node_modules
2626

2727
# Users Environment Variables
2828
.lock-wscript
29+
30+
#IntelliJ
31+
.idea
32+

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
language: node_js
22
node_js:
3+
- "0.8"
34
- "0.10"
45

5-
#travis build speed up
6+
before_install:
7+
- '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
8+
- npm install -g npm@latest
9+
- npm install -g grunt-cli
10+
11+
#travis build speed up
612
sudo: false
713
cache:
814
directories:

Gruntfile.js

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module.exports = function (grunt) {
22
'use strict';
33

4-
require('shelljs/global');
5-
64
var config = {
75
pkg: grunt.file.readJSON('package.json'),
86
concat: {
@@ -15,6 +13,15 @@ module.exports = function (grunt) {
1513
dest: 'dist/<%= pkg.name %>.js'
1614
}
1715
},
16+
comments: {
17+
js: {
18+
options: {
19+
singleline: true,
20+
multiline: true
21+
},
22+
src: ['<%= concat.dist.dest %>']
23+
}
24+
},
1825
uglify: {
1926
options: {
2027
banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n',
@@ -53,43 +60,16 @@ module.exports = function (grunt) {
5360
reporter: 'spec'
5461
}
5562
}
56-
},
57-
// Client-side tests
58-
mocha: {
59-
test: {
60-
src: ['test/browser.html'],
61-
options: {
62-
run: true
63-
}
64-
}
65-
},
66-
githooks: {
67-
all: {
68-
'pre-commit': 'pre-commit'
69-
}
7063
}
7164
};
7265

7366
grunt.initConfig(config);
7467

75-
grunt.loadNpmTasks('grunt-contrib-concat');
76-
grunt.loadNpmTasks('grunt-contrib-uglify');
77-
grunt.loadNpmTasks('grunt-contrib-jshint');
78-
grunt.loadNpmTasks('grunt-simple-mocha');
79-
grunt.loadNpmTasks('grunt-mocha');
80-
grunt.loadNpmTasks('grunt-jscs');
81-
grunt.loadNpmTasks('grunt-conventional-changelog');
82-
grunt.loadNpmTasks('grunt-githooks');
68+
require('load-grunt-tasks')(grunt);
8369

8470
grunt.registerTask('lint', ['jshint', 'jscs']);
85-
grunt.registerTask('test', ['lint', 'mocha', 'simplemocha']);
86-
grunt.registerTask('build', ['test', 'concat', 'uglify']);
87-
grunt.registerTask('pre-commit', ['build', 'add-compressed-to-git']);
88-
89-
// Add compressed and minified files before committing
90-
grunt.registerTask('add-compressed-to-git', function () {
91-
exec('git add dist/');
92-
});
71+
grunt.registerTask('test', ['lint', 'simplemocha']);
72+
grunt.registerTask('build', ['test', 'concat', 'comments', 'uglify']);
9373

9474
grunt.registerTask('default', []);
9575
};

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ After including the extension in your application, you just need to enable it in
3434
## Example
3535

3636
```javascript
37-
var converter = new Showdown.converter({extensions: ['prettify']}),
37+
var converter = new showdown.Converter({extensions: ['prettify']}),
3838
input = "Here's a simple hello world in javascript:\n" +
3939
"\n" +
4040
" alert('Hello World!');\n" +
@@ -56,5 +56,5 @@ This should output the equivalent to:
5656
```
5757

5858
## License
59-
These files are distributed under BSD license. For more information, please check the [LICENSE file](https://github.com/showdownjs/prettify-extension/blob/master/LICENSE) in the source code.
60-
59+
These files are distributed under BSD license. For more information,
60+
please check the [LICENSE file](https://github.com/showdownjs/prettify-extension/blob/master/LICENSE) in the source code.

bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "showdown-prettify",
3-
"description": "Add markdown prettify favor to showdown",
3+
"description": "Add markdown prettify flavor to showdown",
44
"homepage": "https://github.com/showdownjs/prettify-extension",
55
"license": "BSD",
66
"authors": [
7-
"Estevão Santos (https://github.com/tivie)",
7+
"Estevão Soares dos Santos (https://github.com/tivie)",
88
"Pascal Deschênes (https://github.com/pdeschen)",
99
"Corey Innis (https://github.com/coreyti)",
1010
"John Fraser"
@@ -22,7 +22,7 @@
2222
},
2323
"main": ["dist/showdown-prettify.js"],
2424
"dependencies": {
25-
"showdown": "^0.3.4"
25+
"showdown": "1.0.x"
2626
},
2727
"ignore": [
2828
"src/",

dist/showdown-prettify.js

Lines changed: 7 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/showdown-prettify.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/showdown-prettify.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/showdown-prettify.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)