Skip to content

Commit

Permalink
Merge branch 'release/0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
kubak10 committed Dec 11, 2014
2 parents f92d845 + d572412 commit 6767b1c
Show file tree
Hide file tree
Showing 435 changed files with 18,637 additions and 186,309 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
node_modules
bower_components
bower_components
bower_components/handsontable
190 changes: 0 additions & 190 deletions CHANGELOG.md

This file was deleted.

55 changes: 19 additions & 36 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is used to build Angular UI Handsontable from `src/*`
* This file is used to build ngHandsontable from `src/*`
*
* Installation:
* 1. Install Grunt CLI (`npm install -g grunt-cli`)
Expand All @@ -10,24 +10,26 @@
* To execute automatically after each change, execute `grunt --force default watch`
*
* Result:
* building Angular UI Handsontable will create files:
* - dist/angular-ui-handsontable.full.js
* - dist/angular-ui-handsontable.full.css
* - dist/angular-ui-handsontable.full.min.js
* - dist/angular-ui-handsontable.full.min.css
* building ngHandsontable will create files:
* - dist/ngHandsontable.js
* - dist/ngHandsontable.min.js
*
* See http://gruntjs.com/getting-started for more information about Grunt
*/
module.exports = function (grunt) {
var myBanner = '/**\n' +
' * <%= pkg.name %> <%= pkg.version %>\n' +
' * \n' +
' * Copyright 2012-2014 Marcin Warpechowski\n' +
' * Licensed under the MIT license.\n' +
' * https://github.com/handsontable/ngHandsontable\n' +
' * Date: <%= (new Date()).toString() %>\n' +
'*/\n\n';


grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
concat: {

concat: {
options: {
banner: myBanner
},
Expand All @@ -39,47 +41,28 @@ module.exports = function (grunt) {
'src/directives/*.js'
],
dest: 'dist/ngHandsontable.js'
},
full_js: {
src: [
'src/ie-shim.js',
'src/angular-ui-handsontable.js',
'bower_components/handsontable/dist/jquery.handsontable.full.js'
],
dest: 'dist/angular-ui-handsontable.full.js'
},
full_css: {
src: [
'bower_components/handsontable/dist/jquery.handsontable.full.css'
],
dest: 'dist/angular-ui-handsontable.full.css'
}
}
},
uglify: {

uglify: {
options: {
banner: myBanner
},
"dist/angular-ui-handsontable.full.min.js": ["dist/angular-ui-handsontable.full.js" ],
"dist/ngHandsontable.min.js": ["dist/ngHandsontable.js"]
},
cssmin: {
options: {
banner: myBanner
},
"dist/angular-ui-handsontable.full.min.css": ["dist/angular-ui-handsontable.full.css" ]
},
watch: {

watch: {
files: ['src/**/*', 'bower_components/**/*'],
tasks: ['concat', 'uglify', 'cssmin']
tasks: ['concat', 'uglify']
}
});

// Default task.
grunt.registerTask('default', ['concat', 'uglify', 'cssmin']);
// grunt.registerTask('default', ['concat', 'uglify', 'cssmin']);

grunt.registerTask('default', ['concat', 'uglify']);

grunt.loadNpmTasks('grunt-css');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-watch');
};
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(The MIT License)

Copyright (c) 2012 Marcin Warpechowski <[email protected]>
Copyright (c) 2012 Marcin Warpechowski <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
Loading

0 comments on commit 6767b1c

Please sign in to comment.