Skip to content

Commit 92a829f

Browse files
committed
Merge pull request wenzhixin#1999 from wenzhixin/develop
1.10.1
2 parents 1606831 + 7e69a82 commit 92a829f

File tree

138 files changed

+321
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+321
-171
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions

Gruntfile.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
'use strict';
22

3+
var fs = require('fs');
4+
35
module.exports = function(grunt) {
46

57
// Project configuration.
@@ -77,14 +79,54 @@ module.exports = function(grunt) {
7779
dest: 'docs/dist', // destination folder
7880
expand: true // required when using cwd
7981
}
82+
},
83+
release: {
84+
options: {
85+
additionalFiles: ['bootstrap-table.jquery.json'],
86+
beforeRelease: ['docs', 'default']
87+
}
8088
}
8189
});
8290

91+
var bumpVersion = function (path, version, startWith) {
92+
var lines = fs.readFileSync(path, 'utf8').split('\n');
93+
lines.forEach(function (line, i) {
94+
if (line.indexOf(startWith) === 0) {
95+
lines[i] = startWith + version;
96+
}
97+
});
98+
fs.writeFileSync(path, lines.join('\n'), 'utf8');
99+
100+
grunt.log.ok('bumped version of ' + path + ' to ' + version);
101+
};
102+
103+
grunt.registerTask('docs', 'build the docs', function () {
104+
var version = require('./package.json').version;
105+
bumpVersion('./_config.yml', version, 'current_version: ');
106+
bumpVersion('./src/bootstrap-table.js', version, ' * version: ');
107+
bumpVersion('./src/bootstrap-table.css', version, ' * version: ');
108+
109+
var changeLog = fs.readFileSync('./CHANGELOG.md', 'utf8');
110+
var latestLogs = changeLog.split('### ')[1];
111+
var date = new Date();
112+
113+
var lines = [
114+
'### Latest release (' +
115+
[date.getFullYear(), date.getMonth() + 1, date.getDate()].join('-') + ')',
116+
'',
117+
'#### v' + latestLogs
118+
];
119+
fs.writeFileSync('./docs/_includes/latest-release.md', lines.join('\n'), 'utf8');
120+
121+
grunt.log.ok('updated the latest-release.md to ' + version);
122+
});
123+
83124
grunt.loadNpmTasks('grunt-contrib-clean');
84125
grunt.loadNpmTasks('grunt-contrib-concat');
85126
grunt.loadNpmTasks('grunt-contrib-uglify');
86127
grunt.loadNpmTasks('grunt-contrib-cssmin');
87128
grunt.loadNpmTasks('grunt-contrib-copy');
129+
grunt.loadNpmTasks('grunt-release');
88130

89131
grunt.registerTask('default', ['clean', 'concat', 'uglify', 'cssmin', 'copy']);
90132
};

dist/bootstrap-table-locale-all.min.js

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/bootstrap-table.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
showToggle: false,
293293
buttonsAlign: 'right',
294294
smartDisplay: true,
295-
escape: true,
295+
escape: false,
296296
minimumCountColumns: 1,
297297
idField: undefined,
298298
uniqueId: undefined,

dist/bootstrap-table.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/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js

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/extensions/angular/bootstrap-table-angular.min.js

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/extensions/cookie/bootstrap-table-cookie.min.js

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/extensions/editable/bootstrap-table-editable.min.js

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/extensions/export/bootstrap-table-export.min.js

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)