nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 00:25:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge in fade changes

Browse Source
This commit is contained in:
Eric Mann
2015-03-06 14:15:21 -08:00
parent c9b97572ab 7db7addfde
commit ee7b5be322
7 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/jquery.gridster.css
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/*! gridster.js - v0.5.7 - 2015-02-17
/*! gridster.js - v0.5.7 - 2015-03-06
* http://gridster.net/
* Copyright (c) 2015 ducksboard; Licensed MIT */
dist/jquery.gridster.js
Vendored
+12 -3
View File
@@ -1,4 +1,4 @@
/*! gridster.js - v0.5.7 - 2015-02-17
/*! gridster.js - v0.5.7 - 2015-03-06
* http://gridster.net/
* Copyright (c) 2015 ducksboard; Licensed MIT */
@@ -1178,14 +1178,19 @@
* @param {Array} [max_size] max_size Maximun size (in units) for width and height.
* @param {Array} [min_size] min_size Minimum size (in units) for width and height.
* @param {string} [model_id] reference to backbone model.
* @param {Boolean} [fade_in] fade the widget into view immediately.
* @return {HTMLElement} Returns the jQuery wrapped HTMLElement representing.
* the widget that was just created.
*/
fn.add_widget = function(html, size_x, size_y, col, row, max_size, min_size, model_id) {
fn.add_widget = function(html, size_x, size_y, col, row, max_size, min_size, model_id, fade_in) {
var pos;
size_x || (size_x = 1);
size_y || (size_y = 1);
if ( undefined === fade_in ) {
fade_in = true;
}
if (!col & !row) {
pos = this.next_position(size_x, size_y);
} else {
@@ -1227,7 +1232,11 @@
this.drag_api.set_limits(this.cols * this.min_widget_width);
return $w.fadeIn();
if ( fade_in ) {
return $w.fadeIn();
} else {
return $w;
}
};
dist/jquery.gridster.min.css
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
/*! gridster.js - v0.5.7 - 2015-02-17 - * http://gridster.net/ - Copyright (c) 2015 ducksboard; Licensed MIT */
/*! gridster.js - v0.5.7 - 2015-03-06 - * http://gridster.net/ - Copyright (c) 2015 ducksboard; Licensed MIT */
.gridster{position:relative}.gridster>*{margin:0 auto;-webkit-transition:height .4s,width .4s;-moz-transition:height .4s,width .4s;-o-transition:height .4s,width .4s;-ms-transition:height .4s,width .4s;transition:height .4s,width .4s}.gridster .gs-w{z-index:2;position:absolute}.ready .gs-w:not(.preview-holder){-webkit-transition:opacity .3s,left .3s,top .3s;-moz-transition:opacity .3s,left .3s,top .3s;-o-transition:opacity .3s,left .3s,top .3s;transition:opacity .3s,left .3s,top .3s}.ready .gs-w:not(.preview-holder),.ready .resize-preview-holder{-webkit-transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;-moz-transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;-o-transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;transition:opacity .3s,left .3s,top .3s,width .3s,height .3s}.gridster .preview-holder{z-index:1;position:absolute;background-color:#fff;border-color:#fff;opacity:.3}.gridster .player-revert{z-index:10!important;-webkit-transition:left .3s,top .3s!important;-moz-transition:left .3s,top .3s!important;-o-transition:left .3s,top .3s!important;transition:left .3s,top .3s!important}.gridster .dragging,.gridster .resizing{z-index:10!important;-webkit-transition:all 0s!important;-moz-transition:all 0s!important;-o-transition:all 0s!important;transition:all 0s!important}.gs-resize-handle{position:absolute;z-index:1}.gs-resize-handle-both{width:20px;height:20px;bottom:-8px;right:-8px;background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pg08IS0tIEdlbmVyYXRvcjogQWRvYmUgRmlyZXdvcmtzIENTNiwgRXhwb3J0IFNWRyBFeHRlbnNpb24gYnkgQWFyb24gQmVhbGwgKGh0dHA6Ly9maXJld29ya3MuYWJlYWxsLmNvbSkgLiBWZXJzaW9uOiAwLjYuMSAgLS0+DTwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DTxzdmcgaWQ9IlVudGl0bGVkLVBhZ2UlMjAxIiB2aWV3Qm94PSIwIDAgNiA2IiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjojZmZmZmZmMDAiIHZlcnNpb249IjEuMSINCXhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbDpzcGFjZT0icHJlc2VydmUiDQl4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjZweCIgaGVpZ2h0PSI2cHgiDT4NCTxnIG9wYWNpdHk9IjAuMzAyIj4NCQk8cGF0aCBkPSJNIDYgNiBMIDAgNiBMIDAgNC4yIEwgNCA0LjIgTCA0LjIgNC4yIEwgNC4yIDAgTCA2IDAgTCA2IDYgTCA2IDYgWiIgZmlsbD0iIzAwMDAwMCIvPg0JPC9nPg08L3N2Zz4=);background-position:top left;background-repeat:no-repeat;cursor:se-resize;z-index:20}.gs-resize-handle-x{top:0;bottom:13px;right:-5px;width:10px;cursor:e-resize}.gs-resize-handle-y{left:0;right:13px;bottom:-5px;height:10px;cursor:s-resize}.gs-w:hover .gs-resize-handle,.resizing .gs-resize-handle{opacity:1}.gs-resize-handle,.gs-w.dragging .gs-resize-handle{opacity:0}.gs-resize-disabled .gs-resize-handle{display:none!important}[data-max-sizex="1"] .gs-resize-handle-x,[data-max-sizey="1"] .gs-resize-handle-y,[data-max-sizey="1"][data-max-sizex="1"] .gs-resize-handle{display:none!important}
dist/jquery.gridster.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/jquery.gridster.with-extras.js
Vendored
+12 -3
View File
@@ -1,4 +1,4 @@
/*! gridster.js - v0.5.7 - 2015-02-17
/*! gridster.js - v0.5.7 - 2015-03-06
* http://gridster.net/
* Copyright (c) 2015 ducksboard; Licensed MIT */
@@ -1178,14 +1178,19 @@
* @param {Array} [max_size] max_size Maximun size (in units) for width and height.
* @param {Array} [min_size] min_size Minimum size (in units) for width and height.
* @param {string} [model_id] reference to backbone model.
* @param {Boolean} [fade_in] fade the widget into view immediately.
* @return {HTMLElement} Returns the jQuery wrapped HTMLElement representing.
* the widget that was just created.
*/
fn.add_widget = function(html, size_x, size_y, col, row, max_size, min_size, model_id) {
fn.add_widget = function(html, size_x, size_y, col, row, max_size, min_size, model_id, fade_in) {
var pos;
size_x || (size_x = 1);
size_y || (size_y = 1);
if ( undefined === fade_in ) {
fade_in = true;
}
if (!col & !row) {
pos = this.next_position(size_x, size_y);
} else {
@@ -1227,7 +1232,11 @@
this.drag_api.set_limits(this.cols * this.min_widget_width);
return $w.fadeIn();
if ( fade_in ) {
return $w.fadeIn();
} else {
return $w;
}
};
dist/jquery.gridster.with-extras.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/jquery.gridster.js
+11 -2
View File
@@ -324,14 +324,19 @@
* @param {Array} [max_size] max_size Maximun size (in units) for width and height.
* @param {Array} [min_size] min_size Minimum size (in units) for width and height.
* @param {string} [model_id] reference to backbone model.
* @param {Boolean} [fade_in] fade the widget into view immediately.
* @return {HTMLElement} Returns the jQuery wrapped HTMLElement representing.
* the widget that was just created.
*/
fn.add_widget = function(html, size_x, size_y, col, row, max_size, min_size, model_id) {
fn.add_widget = function(html, size_x, size_y, col, row, max_size, min_size, model_id, fade_in) {
var pos;
size_x || (size_x = 1);
size_y || (size_y = 1);
if ( undefined === fade_in ) {
fade_in = true;
}
if (!col & !row) {
pos = this.next_position(size_x, size_y);
} else {
@@ -373,7 +378,11 @@
this.drag_api.set_limits(this.cols * this.min_widget_width);
return $w.fadeIn();
if ( fade_in ) {
return $w.fadeIn();
} else {
return $w;
}
};