Skip to content

Commit

Permalink
chore(grunt): fixing versioning system
Browse files Browse the repository at this point in the history
  • Loading branch information
floyd_hawkes committed Apr 6, 2015
1 parent f8d3d2d commit d5bf56c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ module.exports = function(grunt) {

bump: {
options: {
files: ['package.json'],
files: ['package.json', 'bower.json'],
updateConfigs: ['pkg'],
commit: true,
commitMessage: 'Release v%VERSION%',
commitFiles: ['package.json', 'CHANGELOG.md', 'dist/'], // '-a' for all files
commitFiles: ['package.json', 'bower.json', 'CHANGELOG.md', 'dist/'], // '-a' for all files
createTag: true,
tagName: 'v%VERSION%',
tagMessage: 'Version %VERSION%',
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gridster",
"homepage": "https://github.com/DecksterTeam/gridster.js",
"version": "0.6.3",
"version": "0.6.5",
"dependencies": {
"jquery": "~1.11.2"
},
Expand Down
5 changes: 3 additions & 2 deletions src/jquery.gridster.js
Original file line number Diff line number Diff line change
Expand Up @@ -526,10 +526,11 @@
* representing the widget.
* @param {Number} size_x The number of cols that will occupy the widget.
* @param {Number} size_y The number of rows that will occupy the widget.
* @param {Number} col The column to resize the widget from.
* @param {Function} [callback] Function executed when the widget is expanded.
* @return {HTMLElement} Returns $widget.
*/
fn.expand_widget = function($widget, size_x, size_y, callback) {
fn.expand_widget = function($widget, size_x, size_y, col, callback) {
var wgd = $widget.coords().grid;
var max_size_x = Math.floor(($(window).width() - this.options.widget_margins[0] * 2) / this.min_widget_width);
size_x = size_x || Math.min(max_size_x, this.cols);
Expand All @@ -539,7 +540,7 @@
$widget.attr('pre_expand_col', wgd.col);
$widget.attr('pre_expand_sizex', wgd.size_x);
$widget.attr('pre_expand_sizey', wgd.size_y);
var new_col = 1;
var new_col = col || 1;

if (size_y > old_size_y) {
this.add_faux_rows(Math.max(size_y - old_size_y, 0));
Expand Down

0 comments on commit d5bf56c

Please sign in to comment.