nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-01 16:26:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore(grunt): fixing versioning system

Browse Source
This commit is contained in:
floyd_hawkes
2015-04-06 16:19:38 -04:00
parent f8d3d2d223
commit d5bf56c39d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+2 -2
View File
@@ -133,11 +133,11 @@ module.exports = function(grunt) {
bump: { bump: {
options: { options: {
files: ['package.json'], files: ['package.json', 'bower.json'],
updateConfigs: ['pkg'], updateConfigs: ['pkg'],
commit: true, commit: true,
commitMessage: 'Release v%VERSION%', 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, createTag: true,
tagName: 'v%VERSION%', tagName: 'v%VERSION%',
tagMessage: 'Version %VERSION%', tagMessage: 'Version %VERSION%',
bower.json
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "gridster", "name": "gridster",
"homepage": "https://github.com/DecksterTeam/gridster.js", "homepage": "https://github.com/DecksterTeam/gridster.js",
"version": "0.6.3", "version": "0.6.5",
"dependencies": { "dependencies": {
"jquery": "~1.11.2" "jquery": "~1.11.2"
}, },
src/jquery.gridster.js
+3 -2
View File
@@ -526,10 +526,11 @@
* representing the widget. * representing the widget.
* @param {Number} size_x The number of cols that will occupy 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} 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. * @param {Function} [callback] Function executed when the widget is expanded.
* @return {HTMLElement} Returns $widget. * @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 wgd = $widget.coords().grid;
var max_size_x = Math.floor(($(window).width() - this.options.widget_margins[0] * 2) / this.min_widget_width); 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); size_x = size_x || Math.min(max_size_x, this.cols);
@@ -539,7 +540,7 @@
$widget.attr('pre_expand_col', wgd.col); $widget.attr('pre_expand_col', wgd.col);
$widget.attr('pre_expand_sizex', wgd.size_x); $widget.attr('pre_expand_sizex', wgd.size_x);
$widget.attr('pre_expand_sizey', wgd.size_y); $widget.attr('pre_expand_sizey', wgd.size_y);
var new_col = 1; var new_col = col || 1;
if (size_y > old_size_y) { if (size_y > old_size_y) {
this.add_faux_rows(Math.max(size_y - old_size_y, 0)); this.add_faux_rows(Math.max(size_y - old_size_y, 0));