Revision: 2086
http://mrbs.svn.sourceforge.net/mrbs/?rev=2086&view=rev
Author: cimorrison
Date: 2011-10-13 18:29:25 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Fixed bug preventing bookings from being shortened
Modified Paths:
--------------
mrbs/branches/draggable_bookings/web/Themes/default/header.inc
Modified: mrbs/branches/draggable_bookings/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-13 16:39:20 UTC (rev 2085)
+++ mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-13 18:29:25 UTC (rev 2086)
@@ -78,7 +78,7 @@
global $default_duration_all_day;
global $select_options;
global $ajax_refresh_rate;
- global $main_table_cell_border_width;
+ global $main_table_cell_border_width, $main_cell_height;
$page = basename($PHP_SELF, ".php");
$user = getUserName();
@@ -1318,7 +1318,6 @@
?>
function snapToGrid(coord, direction, force)
{
- console.log("Entering snap: (" + coord + ", " + direction + ",
" + force + ")");
var snapGap = (force) ? 100000: 20; <?php // px ?>
aCoords = ((direction=='left') || (direction=='right')) ?
tableCoordsX : tableCoordsY;
@@ -1337,7 +1336,6 @@
var gap = bottomRight - topLeft;
if ((gapTopLeft <= gap/2) && (gapTopLeft < snapGap))
{
- console.log("TopLeft snap: " + direction + ", gapTopLeft:
" + gapTopLeft);
switch (direction)
{
case 'left':
@@ -1359,7 +1357,6 @@
}
else if ((gapBottomRight <= gap/2) && (gapBottomRight <
snapGap))
{
- console.log("BottomRight snap: " + direction+ ",
gapBottomRight: " + gapBottomRight);
switch (direction)
{
case 'left':
@@ -1420,7 +1417,6 @@
?>
var divResize = function (event, ui)
{
- console.log("Entering resize");
if (divResize.origin === undefined)
{
divResize.origin = divBooking.offset();
@@ -1452,25 +1448,21 @@
<?php // left edge ?>
if (divClone.position().left != divResize.lastPosition.left)
{
- console.log("left edge has changed");
snapToGrid(divResize.origin.left + divClone.position().left,
'left');
}
<?php // right edge ?>
if ((divClone.position().left + divClone.outerWidth()) !=
(divResize.lastPosition.left + divResize.lastSize.width))
{
- console.log("right edge has changed");
snapToGrid(divResize.origin.left + divClone.position().left +
divClone.outerWidth(), 'right');
}
<?php // top edge ?>
if (divClone.position().top != divResize.lastPosition.top)
{
- console.log("top edge has changed");
snapToGrid(divResize.origin.top + divClone.position().top,
'top');
}
<?php // bottom edge ?>
if ((divClone.position().top + divClone.outerHeight()) !=
(divResize.lastPosition.top + divResize.lastSize.height))
{
- console.log("bottom edge has changed");
snapToGrid(divResize.origin.top + divClone.position().top +
divClone.outerHeight(), 'bottom');
}
@@ -1556,6 +1548,7 @@
.css('left', '0')
.css('background-color', $(this).css('background-color'))
.css('max-height', 'none')
+ .css('min-height', '<?php echo $main_cell_height ?>px')
.width(divBooking.outerWidth())
.height(divBooking.outerHeight())
.resizable({handles: 'all',
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
