Skip to content

Commit

Permalink
Merge pull request #178 from endorama/master
Browse files Browse the repository at this point in the history
promote angular dependencies to ~1.2.9
  • Loading branch information
esvit committed Jan 22, 2014
2 parents 568fea5 + 9a31068 commit e39e2a2
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 25 deletions.
12 changes: 6 additions & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = function(grunt) {

grunt.initConfig({
cmpnt: grunt.file.readJSON('bower.json'),
banner: '/*! ngTable v<%= cmpnt.version %> by Vitalii Savchuk(esvit666@gmail.com) - ' +
banner: '/*! ngTable v<%= cmpnt.version %> by Vitalii Savchuk(esvit666@gmail.com) - ' +
'https://github.com/esvit/ng-table - New BSD License */\n',
clean: {
working: {
Expand All @@ -20,11 +20,11 @@ module.exports = function(grunt) {
uglify: {
js: {
src: ['ng-table.src.js'],
dest: 'ng-table.js',
dest: 'ng-table.min.js',
options: {
banner: '<%= banner %>',
sourceMap: function(fileName) {
return fileName.replace(/\.js$/, '.map');
return fileName.replace(/\.min\.js$/, '.map');
}
}
}
Expand All @@ -46,14 +46,14 @@ module.exports = function(grunt) {
less: {
css: {
files: {
'ng-table.css': 'src/styles/ng-table.less'
'ng-table.min.css': 'src/styles/ng-table.less'
}
}
},
cssmin: {
css: {
files: {
'ng-table.css': 'ng-table.css'
'ng-table.min.css': 'ng-table.min.css'
},
options: {
banner: '<%= banner %>'
Expand Down Expand Up @@ -95,4 +95,4 @@ module.exports = function(grunt) {
'cssmin'
]);

};
};
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"src"
],
"dependencies": {
"angular": "=1.2.3"
"angular": "~1.2.9"
},
"devDependencies": {
"angular-mocks": "1.2.3"
"angular-mocks": "~1.2.9"
}
}
3 changes: 0 additions & 3 deletions ng-table.js

This file was deleted.

Loading

0 comments on commit e39e2a2

Please sign in to comment.