build: exclude dateui from jquery build, move wysihtml to inputs-ext
This commit is contained in:
		@@ -4,6 +4,7 @@ X-editable changelog
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
Version 1.4.0 wip
 | 
					Version 1.4.0 wip
 | 
				
			||||||
----------------------------
 | 
					----------------------------
 | 
				
			||||||
 | 
					[enh] jquery-ui datepicker excluded from `plain` jquery build (vitalets) 
 | 
				
			||||||
[enh] added new input type: combodate (vitalets) 
 | 
					[enh] added new input type: combodate (vitalets) 
 | 
				
			||||||
[bug #68] allow arrays for data attributes (adimitrov) 
 | 
					[bug #68] allow arrays for data attributes (adimitrov) 
 | 
				
			||||||
[enh] setValue method updates input if form is open (vitalets) 
 | 
					[enh] setValue method updates input if form is open (vitalets) 
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										18
									
								
								grunt.js
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								grunt.js
									
									
									
									
									
								
							@@ -14,7 +14,6 @@ function getFiles() {
 | 
				
			|||||||
            inputs: [
 | 
					            inputs: [
 | 
				
			||||||
                inputs+'date/date.js', 
 | 
					                inputs+'date/date.js', 
 | 
				
			||||||
                inputs+'date/datefield.js', 
 | 
					                inputs+'date/datefield.js', 
 | 
				
			||||||
                inputs+'wysihtml5/wysihtml5.js', 
 | 
					 | 
				
			||||||
                inputs+'date/bootstrap-datepicker/js/bootstrap-datepicker.js'], 
 | 
					                inputs+'date/bootstrap-datepicker/js/bootstrap-datepicker.js'], 
 | 
				
			||||||
            css: [inputs+'date/bootstrap-datepicker/css/datepicker.css']
 | 
					            css: [inputs+'date/bootstrap-datepicker/css/datepicker.css']
 | 
				
			||||||
        },  
 | 
					        },  
 | 
				
			||||||
@@ -30,7 +29,6 @@ function getFiles() {
 | 
				
			|||||||
        jquery: {
 | 
					        jquery: {
 | 
				
			||||||
            form: [],
 | 
					            form: [],
 | 
				
			||||||
            container: [containers+'editable-poshytip.js'],
 | 
					            container: [containers+'editable-poshytip.js'],
 | 
				
			||||||
            inputs: [inputs+'dateui/dateui.js'],
 | 
					 | 
				
			||||||
            css: []
 | 
					            css: []
 | 
				
			||||||
        }      
 | 
					        }      
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
@@ -67,7 +65,7 @@ function getFiles() {
 | 
				
			|||||||
    for(var k in config) {
 | 
					    for(var k in config) {
 | 
				
			||||||
        folder = '<%= dist %>/'+k+'-editable/';
 | 
					        folder = '<%= dist %>/'+k+'-editable/';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //popup
 | 
					        //js
 | 
				
			||||||
        task = k+'_js';
 | 
					        task = k+'_js';
 | 
				
			||||||
        dest = folder+'js/'+k+'-editable'+ (k === 'jquery' ? '-poshytip' : '');
 | 
					        dest = folder+'js/'+k+'-editable'+ (k === 'jquery' ? '-poshytip' : '');
 | 
				
			||||||
        concat_files[task] = {
 | 
					        concat_files[task] = {
 | 
				
			||||||
@@ -155,12 +153,14 @@ module.exports = function(grunt) {
 | 
				
			|||||||
              'src/editable-form/*.js', 
 | 
					              'src/editable-form/*.js', 
 | 
				
			||||||
              'src/containers/*.js', 
 | 
					              'src/containers/*.js', 
 | 
				
			||||||
              'src/element/*.js', 
 | 
					              'src/element/*.js', 
 | 
				
			||||||
 | 
					              
 | 
				
			||||||
              'src/inputs/*.js', 
 | 
					              'src/inputs/*.js', 
 | 
				
			||||||
              'src/inputs/date/*.js',
 | 
					              'src/inputs/date/*.js',
 | 
				
			||||||
              'src/inputs/dateui/*.js',
 | 
					              'src/inputs/dateui/*.js',
 | 
				
			||||||
              'src/inputs/wysihtml5/*.js',
 | 
					 | 
				
			||||||
              'src/inputs/combodate/*.js',
 | 
					              'src/inputs/combodate/*.js',
 | 
				
			||||||
              'src/inputs-ext/**/*.js'
 | 
					              
 | 
				
			||||||
 | 
					              'src/inputs-ext/address/*.js',
 | 
				
			||||||
 | 
					              'src/inputs-ext/wysihtml5/*.js'
 | 
				
			||||||
              ]
 | 
					              ]
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    /*
 | 
					    /*
 | 
				
			||||||
@@ -208,13 +208,7 @@ module.exports = function(grunt) {
 | 
				
			|||||||
            options: {
 | 
					            options: {
 | 
				
			||||||
               basePath: 'inputs-ext'
 | 
					               basePath: 'inputs-ext'
 | 
				
			||||||
            }            
 | 
					            }            
 | 
				
			||||||
        },
 | 
					        }
 | 
				
			||||||
        ui_datepicker: {
 | 
					 | 
				
			||||||
         files: {
 | 
					 | 
				
			||||||
             //copy jquery ui datepicker (for jquery build)
 | 
					 | 
				
			||||||
             '<%= dist %>/jquery-editable/jquery-ui-datepicker/' : 'src/inputs/dateui/jquery-ui-datepicker/**' 
 | 
					 | 
				
			||||||
         }
 | 
					 | 
				
			||||||
       } 
 | 
					 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
    uglify: {}
 | 
					    uglify: {}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user