Skip to content

Commit

Permalink
Merge pull request #125 from axisj-com/thomas
Browse files Browse the repository at this point in the history
Gruntjs
  dist/AXJ.min.js
  ui/arongi/AXJ.min.css
  ui/bulldog/AXJ.min.css
  ui/cocker/AXJ.min.css
  ui/flybasket/AXJ.min.css
  ui/kakao/AXJ.min.css

AXTopDownMenu v1.21
 - childMenu 오픈 위치 버그 픽스
AXGrid v1.70
 - emptyList bugfix
  • Loading branch information
thomasJang committed May 19, 2014
2 parents 4f09f0d + b2adb4a commit 69700ab
Show file tree
Hide file tree
Showing 1,008 changed files with 258,502 additions and 580 deletions.
131 changes: 131 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
module.exports = function(grunt) {

// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
concat: {
options: {
stripBanners: true,
separator: ';',
banner: '/*! \n<%= pkg.name %> - v<%= pkg.version %> - ' +
'<%= grunt.template.today("yyyy-mm-dd") %> \n*/\n',
separator: '\n/* ---------------------------- */\n'
},
dist: {
src: [
'lib/AXJ.js',
'lib/AXDOMRange.js',
'lib/AXDrag.js',
'lib/AXEditor.js',
'lib/AXExcelConvert.js',
//'lib/AXFrameSet.js',
'lib/AXGrid.js',
'lib/AXHtmlElement.js',
'lib/AXInput.js',
'lib/AXMobileMenu.js',
'lib/AXModal.js',
'lib/AXModelControl.js',
'lib/AXModelControlGrid.js',
'lib/AXMultiSelector.js',
'lib/AXProgress.js',
//'lib/AXScheduleCalendar.js',
'lib/AXSearch.js',
'lib/AXSelect.js',
//'lib/AXSlidePPT.js',
'lib/AXSlideViewer.js',
'lib/AXTab.js',
//'lib/AXTimeTable.js',
'lib/AXTopDownMenu.js',
'lib/AXTree.js',
'lib/AXUpload5.js',
'lib/AXUserSelect.js',
'lib/AXValidator.js',
'lib/AXWaterfall.js'
],
dest: 'dist/<%= pkg.name %>.all.js',
}
},
uglify: {
options: {
mangle: false,
preserveComments: false
},
my_target: {
files: {
'dist/<%= pkg.name %>.min.js': ['dist/<%= pkg.name %>.all.js']
}
}
},
cssmin: {
add_banner: {
options: {
banner: '/*! \n<%= pkg.name %> - v<%= pkg.version %> - ' +
'<%= grunt.template.today("yyyy-mm-dd") %> \n*/\n'
},
files: {
'ui/arongi/AXJ.min.css':
[
'ui/arongi/*.css',
'!ui/arongi/dx-*.css',
'!ui/arongi/tx-*.css',
'!ui/arongi/mx-*.css',
'!ui/arongi/font-*.css',
'!ui/arongi/*.min.css',
'!ui/arongi/page.css',
'!ui/arongi/preset.css'
],
'ui/bulldog/AXJ.min.css':
[
'ui/bulldog/*.css',
'!ui/bulldog/dx-*.css',
'!ui/bulldog/tx-*.css',
'!ui/bulldog/mx-*.css',
'!ui/bulldog/font-*.css',
'!ui/bulldog/*.min.css',
'!ui/bulldog/page.css',
'!ui/bulldog/preset.css'
],
'ui/cocker/AXJ.min.css':
[
'ui/cocker/*.css',
'!ui/cocker/dx-*.css',
'!ui/cocker/tx-*.css',
'!ui/cocker/mx-*.css',
'!ui/cocker/font-*.css',
'!ui/cocker/*.min.css',
'!ui/cocker/page.css',
'!ui/cocker/preset.css'
],
'ui/flybasket/AXJ.min.css':
[
'ui/flybasket/*.css',
'!ui/flybasket/dx-*.css',
'!ui/flybasket/tx-*.css',
'!ui/flybasket/mx-*.css',
'!ui/flybasket/font-*.css',
'!ui/flybasket/*.min.css',
'!ui/flybasket/page.css',
'!ui/flybasket/preset.css'
],
'ui/kakao/AXJ.min.css':
[
'ui/kakao/*.css',
'!ui/kakao/dx-*.css',
'!ui/kakao/tx-*.css',
'!ui/kakao/mx-*.css',
'!ui/kakao/font-*.css',
'!ui/kakao/*.min.css',
'!ui/kakao/page.css',
'!ui/kakao/preset.css'
]
}
}
}
});
//grunt.loadTasks('tasks');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-cssmin');

grunt.registerTask('default', ['concat','uglify','cssmin']);
};
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "axisj",
"version": "1.0.3",
"version": "1.0.4",
"homepage": "https://github.com/axisj-com/axisj",
"authors": [
"tom@axisj.com thomasJ and team axisj"
Expand Down
Loading

0 comments on commit 69700ab

Please sign in to comment.