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

Merge pull request #22 from Nedlinin/master

Browse Source 
Fix issue with the dragging of widgets pushing off to the right funny…
This commit is contained in:
David S Morse
2015-08-05 21:42:40 -06:00
parent a1d77eb9bd 6a7a2c53d4
commit af9abd8449
6 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/jquery.gridster.js
Vendored
+11 -3
View File
@@ -1,4 +1,4 @@
/*! gridster.js - v0.6.10 - 2015-06-30
/*! gridster.js - v0.6.10 - 2015-08-05
* https://dsmorse.github.io/gridster.js/
* Copyright (c) 2015 ducksboard; Licensed MIT */
@@ -2388,9 +2388,13 @@
if (this.$player === null) {
return false;
}
var margin_sides = this.options.widget_margins[0];
var placeholder_column = this.$preview_holder.attr('data-col');
var abs_offset = {
left: ui.position.left + this.baseX,
left: ui.position.left + this.baseX - (margin_sides * placeholder_column),
top: ui.position.top + this.baseY
};
@@ -2438,8 +2442,12 @@
fn.on_stop_drag = function (event, ui) {
this.$helper.add(this.$player).add(this.$wrapper)
.removeClass('dragging');
var margin_sides = this.options.widget_margins[0];
ui.position.left = ui.position.left + this.baseX;
var placeholder_column = this.$preview_holder.attr('data-col');
ui.position.left = ui.position.left + this.baseX - (margin_sides * placeholder_column);
ui.position.top = ui.position.top + this.baseY;
this.colliders_data = this.collision_api.get_closest_colliders(
ui.position);
dist/jquery.gridster.min.css
Vendored
+1
View File
@@ -1 +1,2 @@
/*! gridster.js - v0.6.10 - 2015-08-05 - * https://dsmorse.github.io/gridster.js/ - Copyright (c) 2015 ducksboard; Licensed MIT */
.gridster{position:relative}.gridster>*{-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}.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.collapsed{height:auto!important}.gridster.collapsed .gs-w{position:static!important}.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 .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,[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
+2 -2
View File
File diff suppressed because one or more lines are too long
dist/jquery.gridster.with-extras.js
Vendored
+11 -3
View File
@@ -1,4 +1,4 @@
/*! gridster.js - v0.6.10 - 2015-06-30
/*! gridster.js - v0.6.10 - 2015-08-05
* https://dsmorse.github.io/gridster.js/
* Copyright (c) 2015 ducksboard; Licensed MIT */
@@ -2388,9 +2388,13 @@
if (this.$player === null) {
return false;
}
var margin_sides = this.options.widget_margins[0];
var placeholder_column = this.$preview_holder.attr('data-col');
var abs_offset = {
left: ui.position.left + this.baseX,
left: ui.position.left + this.baseX - (margin_sides * placeholder_column),
top: ui.position.top + this.baseY
};
@@ -2438,8 +2442,12 @@
fn.on_stop_drag = function (event, ui) {
this.$helper.add(this.$player).add(this.$wrapper)
.removeClass('dragging');
var margin_sides = this.options.widget_margins[0];
ui.position.left = ui.position.left + this.baseX;
var placeholder_column = this.$preview_holder.attr('data-col');
ui.position.left = ui.position.left + this.baseX - (margin_sides * placeholder_column);
ui.position.top = ui.position.top + this.baseY;
this.colliders_data = this.collision_api.get_closest_colliders(
ui.position);
dist/jquery.gridster.with-extras.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
src/jquery.gridster.js
+10 -2
View File
@@ -1490,9 +1490,13 @@
if (this.$player === null) {
return false;
}
var margin_sides = this.options.widget_margins[0];
var placeholder_column = this.$preview_holder.attr('data-col');
var abs_offset = {
left: ui.position.left + this.baseX,
left: ui.position.left + this.baseX - (margin_sides * placeholder_column),
top: ui.position.top + this.baseY
};
@@ -1540,8 +1544,12 @@
fn.on_stop_drag = function (event, ui) {
this.$helper.add(this.$player).add(this.$wrapper)
.removeClass('dragging');
var margin_sides = this.options.widget_margins[0];
ui.position.left = ui.position.left + this.baseX;
var placeholder_column = this.$preview_holder.attr('data-col');
ui.position.left = ui.position.left + this.baseX - (margin_sides * placeholder_column);
ui.position.top = ui.position.top + this.baseY;
this.colliders_data = this.collision_api.get_closest_colliders(
ui.position);