Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzofox3 committed Aug 5, 2015
1 parent 02391fe commit bae254c
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-smart-table",
"version": "2.1.1",
"version": "2.1.2",
"homepage": "https://github.com/lorenzofox3/Smart-Table",
"authors": [
"lorenzofox3 <[email protected]>"
Expand Down
3 changes: 3 additions & 0 deletions changeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,6 @@ function(tableState, tableController){
* support commonjs
* add totalItemCount on tableState (@eirikbell)

## version 2.1.2

* improve build #461 [stanleyxu](https://github.com/stanleyxu2005)
5 changes: 2 additions & 3 deletions dist/smart-table.js

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions dist/smart-table.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/smart-table.min.js.map

Large diffs are not rendered by default.

24 changes: 11 additions & 13 deletions gulpFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@ var src = (['smart-table.module', 'stConfig', 'stTable']).concat(pluginList).map
src.push('src/bottom.txt');
src.unshift('src/top.txt');

//modules
gulp.task('uglify', function () {
gulp.src(src)
.pipe(concat('smart-table.min.js'))
.pipe(uglify())
.pipe(gulp.dest(disFolder));
});


//just as indication
gulp.task('lint', function () {
gulp.src(src)
Expand All @@ -41,12 +32,19 @@ gulp.task('karma-CI', function (done) {
karma.start(conf, done);
});

gulp.task('uglify', function () {
gulp.src(src)
.pipe(concat('smart-table.min.js'))
.pipe(sourcemaps.init())
.pipe(uglify())
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest(disFolder));
});

gulp.task('concat', function () {
gulp.src(src, { base: '.' })
.pipe(sourcemaps.init())
.pipe(concat('smart-table.js'))
.pipe(sourcemaps.write())
.pipe(gulp.dest(disFolder));
.pipe(concat('smart-table.js'))
.pipe(gulp.dest(disFolder));
});

gulp.task('test', ['karma-CI']);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-smart-table",
"version": "2.1.1",
"version": "2.1.2",
"description": "",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit bae254c

Please sign in to comment.