"gruntified" the libraries, too. and updated the license and the version

information in Gruntfile.js and package.json
This commit is contained in:
Manuel Friedli 2015-01-13 20:06:02 +01:00
parent 351d9b6534
commit 387a89dcbc
11 changed files with 10225 additions and 20 deletions

View file

@ -13,7 +13,7 @@ module.exports = function (grunt) {
'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
' Licensed MIT */\n',
' Licensed <%= pkg.licenses[0].type %> */\n',
// Task configuration.
clean: {
files: ['dist']
@ -23,6 +23,15 @@ module.exports = function (grunt) {
banner: '<%= banner %>',
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: {
src: ['src/uhr.js', 'src/uhr-*.js'],
dest: 'dist/jquery.<%= pkg.name %>.complete.js'
@ -40,6 +49,10 @@ module.exports = function (grunt) {
options: {
banner: '<%= banner %>'
},
libs:{
src: '<%= concat.libs.dest %>',
dest: 'dist/libs.min.js'
},
dist: {
src: '<%= concat.dist.dest %>',
dest: 'dist/jquery.<%= pkg.name %>.complete.min.js'

View file

@ -1,6 +1,6 @@
/*! uhr - v0.0.1 - 2015-01-13
/*! uhr - v7.0-next - 2015-01-13
* http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed MIT */
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
(function($) {
'use strict';
var uhrGlobals = {

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
/*! uhr - v0.0.1 - 2015-01-13
/*! uhr - v7.0-next - 2015-01-13
* http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed MIT */
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
(function($) {
'use strict';
var es_ist = {1: [1, 2, 4, 5, 6]};

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
/*! uhr - v0.0.1 - 2015-01-13
/*! uhr - v7.0-next - 2015-01-13
* http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed MIT */
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
(function($) {
'use strict';
var uhrGlobals = {

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

View file

@ -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="shortcut icon" type="image/png" href="resources/favicon.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="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/libs.min.js"></script>
<script type="text/javascript" src="dist/jquery.uhr.complete.min.js"></script>
<script type="text/javascript">
function go(url) {

View file

@ -1,6 +1,6 @@
{
"name": "uhr",
"version": "0.0.1",
"version": "7.0-next",
"description": "jQuery QLOCKTWO plugin",
"keywords": [
"jquery-plugin", "qlocktwo"
@ -17,7 +17,7 @@
},
"licenses": [
{
"type": "GPL3"
"type": "GPLv3"
}
],
"devDependencies": {
@ -33,7 +33,6 @@
"grunt-contrib-watch": "~0.6.1",
"jshint-stylish": "~0.2.0",
"load-grunt-tasks": "~0.6.0",
"time-grunt": "~0.3.2",
"yo": "^1.3.3"
"time-grunt": "~0.3.2"
}
}