Skip to content

Commit d5bf56c

Browse files
author
floyd_hawkes
committed
chore(grunt): fixing versioning system
1 parent f8d3d2d commit d5bf56c

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ module.exports = function(grunt) {
133133

134134
bump: {
135135
options: {
136-
files: ['package.json'],
136+
files: ['package.json', 'bower.json'],
137137
updateConfigs: ['pkg'],
138138
commit: true,
139139
commitMessage: 'Release v%VERSION%',
140-
commitFiles: ['package.json', 'CHANGELOG.md', 'dist/'], // '-a' for all files
140+
commitFiles: ['package.json', 'bower.json', 'CHANGELOG.md', 'dist/'], // '-a' for all files
141141
createTag: true,
142142
tagName: 'v%VERSION%',
143143
tagMessage: 'Version %VERSION%',

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gridster",
33
"homepage": "https://github.com/DecksterTeam/gridster.js",
4-
"version": "0.6.3",
4+
"version": "0.6.5",
55
"dependencies": {
66
"jquery": "~1.11.2"
77
},

src/jquery.gridster.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,10 +526,11 @@
526526
* representing the widget.
527527
* @param {Number} size_x The number of cols that will occupy the widget.
528528
* @param {Number} size_y The number of rows that will occupy the widget.
529+
* @param {Number} col The column to resize the widget from.
529530
* @param {Function} [callback] Function executed when the widget is expanded.
530531
* @return {HTMLElement} Returns $widget.
531532
*/
532-
fn.expand_widget = function($widget, size_x, size_y, callback) {
533+
fn.expand_widget = function($widget, size_x, size_y, col, callback) {
533534
var wgd = $widget.coords().grid;
534535
var max_size_x = Math.floor(($(window).width() - this.options.widget_margins[0] * 2) / this.min_widget_width);
535536
size_x = size_x || Math.min(max_size_x, this.cols);
@@ -539,7 +540,7 @@
539540
$widget.attr('pre_expand_col', wgd.col);
540541
$widget.attr('pre_expand_sizex', wgd.size_x);
541542
$widget.attr('pre_expand_sizey', wgd.size_y);
542-
var new_col = 1;
543+
var new_col = col || 1;
543544

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

0 commit comments

Comments
 (0)