mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-10-31 16:37:31 -04:00 
			
		
		
		
	Merge pull request #1011 from codedge/Remove-built-public-js
Remove built.public.js
This commit is contained in:
		
						commit
						26c78e4a34
					
				| @ -116,21 +116,19 @@ module.exports = function(grunt) { | ||||
|         dest: 'public/built.js', | ||||
|         nonull: true | ||||
|       }, | ||||
|       js_public: { | ||||
|       /*js_public: { | ||||
|         src: [ | ||||
|         /* | ||||
|           'public/js/simpleexpand.js', | ||||
|           'public/js/valign.js', | ||||
|           'public/js/bootstrap.min.js', | ||||
|           'public/js/simpleexpand.js', | ||||
|         */ | ||||
|           'public/vendor/bootstrap/dist/js/bootstrap.min.js', | ||||
|           'public/js/bootstrap-combobox.js', | ||||
| 
 | ||||
|         ], | ||||
|         dest: 'public/built.public.js', | ||||
|         nonull: true | ||||
|       }, | ||||
|       },*/ | ||||
|       css: { | ||||
|         src: [ | ||||
|           'public/vendor/bootstrap/dist/css/bootstrap.min.css', | ||||
|  | ||||
| @ -42,11 +42,5 @@ elixir(function(mix) { | ||||
|      * JS configuration | ||||
|      */ | ||||
| 
 | ||||
|     // built.public.js
 | ||||
|     mix.scripts([ | ||||
|         bowerDir + '/bootstrap/dist/js/bootstrap.js', | ||||
|         bowerDir + '/bootstrap-combobox/js/bootstrap-combobox.js' | ||||
|     ], elixir.config.publicPath + '/built.public.js'); | ||||
| 
 | ||||
| 
 | ||||
| }); | ||||
|  | ||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user