"gruntified" the libraries, too. and updated the license and the version
information in Gruntfile.js and package.json
This commit is contained in:
		
							parent
							
								
									351d9b6534
								
							
						
					
					
						commit
						387a89dcbc
					
				
					 11 changed files with 10225 additions and 20 deletions
				
			
		
							
								
								
									
										15
									
								
								Gruntfile.js
									
										
									
									
									
								
							
							
						
						
									
										15
									
								
								Gruntfile.js
									
										
									
									
									
								
							|  | @ -13,7 +13,7 @@ module.exports = function (grunt) { | ||||||
|     '<%= grunt.template.today("yyyy-mm-dd") %>\n' + |     '<%= grunt.template.today("yyyy-mm-dd") %>\n' + | ||||||
|     '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' + |     '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' + | ||||||
|     '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' + |     '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' + | ||||||
|     ' Licensed MIT */\n', |     ' Licensed <%= pkg.licenses[0].type %> */\n', | ||||||
|     // Task configuration.
 |     // Task configuration.
 | ||||||
|     clean: { |     clean: { | ||||||
|       files: ['dist'] |       files: ['dist'] | ||||||
|  | @ -23,6 +23,15 @@ module.exports = function (grunt) { | ||||||
|         banner: '<%= banner %>', |         banner: '<%= banner %>', | ||||||
|         stripBanners: true |         stripBanners: true | ||||||
|       }, |       }, | ||||||
|  |       libs: { | ||||||
|  |         src: [ | ||||||
|  |           'bower_components/jquery/dist/jquery.js', | ||||||
|  |           'bower_components/jquery-ui/ui/core.js', | ||||||
|  |           'bower_components/jquery-ui/ui/widget.js', | ||||||
|  |           'bower_components/jquery-cookie/jquery.cookie.js' | ||||||
|  |         ], | ||||||
|  |         dest: 'dist/libs.js' | ||||||
|  |       }, | ||||||
|       dist: { |       dist: { | ||||||
|         src: ['src/uhr.js', 'src/uhr-*.js'], |         src: ['src/uhr.js', 'src/uhr-*.js'], | ||||||
|         dest: 'dist/jquery.<%= pkg.name %>.complete.js' |         dest: 'dist/jquery.<%= pkg.name %>.complete.js' | ||||||
|  | @ -40,6 +49,10 @@ module.exports = function (grunt) { | ||||||
|       options: { |       options: { | ||||||
|         banner: '<%= banner %>' |         banner: '<%= banner %>' | ||||||
|       }, |       }, | ||||||
|  |       libs:{ | ||||||
|  |         src: '<%= concat.libs.dest %>', | ||||||
|  |         dest: 'dist/libs.min.js' | ||||||
|  |       }, | ||||||
|       dist: { |       dist: { | ||||||
|         src: '<%= concat.dist.dest %>', |         src: '<%= concat.dist.dest %>', | ||||||
|         dest: 'dist/jquery.<%= pkg.name %>.complete.min.js' |         dest: 'dist/jquery.<%= pkg.name %>.complete.min.js' | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								dist/jquery.uhr.complete.js
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/jquery.uhr.complete.js
									
										
									
									
										vendored
									
									
								
							|  | @ -1,6 +1,6 @@ | ||||||
| /*! uhr - v0.0.1 - 2015-01-13 | /*! uhr - v7.0-next - 2015-01-13 | ||||||
| * http://bärneruhr.ch/
 | * http://bärneruhr.ch/
 | ||||||
| * Copyright (c) 2015 Manuel Friedli; Licensed MIT */ | * Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */ | ||||||
| (function($) { | (function($) { | ||||||
|     'use strict'; |     'use strict'; | ||||||
|     var uhrGlobals = { |     var uhrGlobals = { | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								dist/jquery.uhr.complete.min.js
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/jquery.uhr.complete.min.js
									
										
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										4
									
								
								dist/jquery.uhr.langs.js
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/jquery.uhr.langs.js
									
										
									
									
										vendored
									
									
								
							|  | @ -1,6 +1,6 @@ | ||||||
| /*! uhr - v0.0.1 - 2015-01-13 | /*! uhr - v7.0-next - 2015-01-13 | ||||||
| * http://bärneruhr.ch/
 | * http://bärneruhr.ch/
 | ||||||
| * Copyright (c) 2015 Manuel Friedli; Licensed MIT */ | * Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */ | ||||||
| (function($) { | (function($) { | ||||||
|     'use strict'; |     'use strict'; | ||||||
|     var es_ist = {1: [1, 2, 4, 5, 6]}; |     var es_ist = {1: [1, 2, 4, 5, 6]}; | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								dist/jquery.uhr.langs.min.js
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/jquery.uhr.langs.min.js
									
										
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										4
									
								
								dist/jquery.uhr.main.js
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/jquery.uhr.main.js
									
										
									
									
										vendored
									
									
								
							|  | @ -1,6 +1,6 @@ | ||||||
| /*! uhr - v0.0.1 - 2015-01-13 | /*! uhr - v7.0-next - 2015-01-13 | ||||||
| * http://bärneruhr.ch/
 | * http://bärneruhr.ch/
 | ||||||
| * Copyright (c) 2015 Manuel Friedli; Licensed MIT */ | * Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */ | ||||||
| (function($) { | (function($) { | ||||||
|     'use strict'; |     'use strict'; | ||||||
|     var uhrGlobals = { |     var uhrGlobals = { | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								dist/jquery.uhr.min.js
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/jquery.uhr.min.js
									
										
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										10189
									
								
								dist/libs.js
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										10189
									
								
								dist/libs.js
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
							
								
								
									
										6
									
								
								dist/libs.min.js
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								dist/libs.min.js
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							|  | @ -31,9 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|     <link rel="stylesheet" type="text/css" href="css/uhr-pink.css" data-class="pink" data-name="Pink"/> |     <link rel="stylesheet" type="text/css" href="css/uhr-pink.css" data-class="pink" data-name="Pink"/> | ||||||
|     <link rel="shortcut icon" type="image/png" href="resources/favicon.png"/> |     <link rel="shortcut icon" type="image/png" href="resources/favicon.png"/> | ||||||
|     <link rel="apple-touch-icon-precomposed" href="resources/apple-touch-icon-precomposed.png"/> |     <link rel="apple-touch-icon-precomposed" href="resources/apple-touch-icon-precomposed.png"/> | ||||||
|     <script type="text/javascript" src="lib/jquery-2.1.0.min.js"></script> |     <script type="text/javascript" src="dist/libs.min.js"></script> | ||||||
|     <script type="text/javascript" src="lib/jquery-ui-1.10.4.custom.min.js"></script> |  | ||||||
|     <script type="text/javascript" src="lib/jquery-cookie-1.4.0.js"></script> |  | ||||||
|     <script type="text/javascript" src="dist/jquery.uhr.complete.min.js"></script> |     <script type="text/javascript" src="dist/jquery.uhr.complete.min.js"></script> | ||||||
|     <script type="text/javascript"> |     <script type="text/javascript"> | ||||||
|         function go(url) { |         function go(url) { | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| { | { | ||||||
|   "name": "uhr", |   "name": "uhr", | ||||||
|   "version": "0.0.1", |   "version": "7.0-next", | ||||||
|   "description": "jQuery QLOCKTWO plugin", |   "description": "jQuery QLOCKTWO plugin", | ||||||
|   "keywords": [ |   "keywords": [ | ||||||
|     "jquery-plugin", "qlocktwo" |     "jquery-plugin", "qlocktwo" | ||||||
|  | @ -17,7 +17,7 @@ | ||||||
|   }, |   }, | ||||||
|   "licenses": [ |   "licenses": [ | ||||||
|     { |     { | ||||||
|       "type": "GPL3" |       "type": "GPLv3" | ||||||
|     } |     } | ||||||
|   ], |   ], | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|  | @ -33,7 +33,6 @@ | ||||||
|     "grunt-contrib-watch": "~0.6.1", |     "grunt-contrib-watch": "~0.6.1", | ||||||
|     "jshint-stylish": "~0.2.0", |     "jshint-stylish": "~0.2.0", | ||||||
|     "load-grunt-tasks": "~0.6.0", |     "load-grunt-tasks": "~0.6.0", | ||||||
|     "time-grunt": "~0.3.2", |     "time-grunt": "~0.3.2" | ||||||
|     "yo": "^1.3.3" |  | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue