Skip to content

Commit

Permalink
Merge pull request #5 from peckadesign/v2.0.0
Browse files Browse the repository at this point in the history
2.0.0
  • Loading branch information
zipper committed Mar 3, 2016
2 parents e08f260 + 6a48405 commit 3913725
Show file tree
Hide file tree
Showing 9 changed files with 1,355 additions and 307 deletions.
39 changes: 39 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
concat: {
options: {
stripBanners: true,
banner: '/**\n' +
' * <%= pkg.title %> - <%= pkg.description %> \n' +
' * <%= pkg.homepage %>\n' +
' *\n' +
' * @author <%= pkg.author.name %> <<%= pkg.author.email %>>\n' +
' * @copyright Copyright (c) 2014-<%= grunt.template.today("yyyy") %> <%= pkg.author.name %>\n' +
' * @license <%= pkg.license %>\n' +
' *\n' +
' * @version <%= pkg.version %>\n' +
' */\n'
},
production: {
src: ['src/jquery.collapsable.js'],
dest: 'dist/jquery.collapsable.js'
}
},
uglify: {
options: {
banner: '/*! <%= pkg.title %> v<%= pkg.version %> | <%= pkg.license %> | <%= pkg.author.name %>, <%= pkg.homepage %> */\n'
},
production: {
files: {
'dist/jquery.collapsable.min.js': ['dist/jquery.collapsable.js']
}
}
}
});

grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');

grunt.registerTask('default', ['concat', 'uglify']);
};
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015 PeckaDesign
Copyright (c) 2016 Radek Šerý

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
18 changes: 7 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
# jquery.collapsable
# jQuery Collapsable

## Instalace

Do závislostí projektu je možné plugin přidat přes odkaz na Github následovně (více viz: http://bower.io/docs/creating-packages/#dependencies):
## Instalation

tba
```
$ cat bower.json
{
"name": "Projekt",
"name": "Project",
"private": true,
"dependencies": {
"jquery.collapsable": "peckadesign/jquery.collapsable#1.0.*"
"jquery.collapsable": "peckadesign/jquery.collapsable#2.0.*"
}
}
```

## Changelog

### v1.1.0
### 2.0.0

- přejmenování `fxSpeed` na `collapseDelay`, nově lze použít i bez `fx`, v tu chvíli nastavuje zpoždění mezi `onExpand/onCollapse` a `onExpanded/onCollapsed`
- oprava výchozího otevírání boxů při načtení stránky dle class a kotvy v url
- úprava callbacků při kliku na `ca-control` prvky; místo `return false;` nově `e.preventDefault()`, díky tomu lze načítat obsah boxů ajaxem (nezablokuje odeslání požadavku)
- přidána podpora pd extension `spinner` (pokud je)
- Plugin has been completely rewritten.
25 changes: 18 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
{
"name": "jquery.collapsable",
"version": "1.1.0",
"homepage": "https://github.com/peckadesign/jquery.collapsable",
"authors": [
"PeckaDesign, s.r.o <[email protected]>",
"Radek Šerý <[email protected]>"
],
"description": "jQuery plugin for collapsable boxes",
"version": "2.0.0",
"main": "jquery.collapsable.js",
"authors": [ "Radek Šerý <[email protected]>" ],
"homepage": "http://peckadesign.github.io/jquery.collapsable/",
"license": "MIT",
"keywords": ["jquery", "jquery-plugin", "collapsable", "jquery-collapsable"],
"dependencies": {
"jquery": ">=1.7"
}
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"demo",
"libs",
"src",
"test",
"*.md",
"Gruntfile.js",
"*.json"
]
}
Loading

0 comments on commit 3913725

Please sign in to comment.