From e312159db15da93d169cd196e739940e0c4f3d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 3 Jan 2013 13:59:21 +0100 Subject: [PATCH] Drop dom-drag.js and implement the functionality using jQuery (rfe#3597853) --- js/dom-drag.js | 169 ------------------------- js/functions.js | 39 +++++- libraries/schema/User_Schema.class.php | 43 ++----- 3 files changed, 47 insertions(+), 204 deletions(-) delete mode 100644 js/dom-drag.js diff --git a/js/dom-drag.js b/js/dom-drag.js deleted file mode 100644 index 539937fa4a..0000000000 --- a/js/dom-drag.js +++ /dev/null @@ -1,169 +0,0 @@ -/************************************************** - * dom-drag.js - * 09.25.2001 - * www.youngpup.net - ************************************************** - * Copyright 2001, Aaron Boodman - * This code is public domain. Please use it for good, not evil. - ************************************************** - * 10.28.2001 - fixed minor bug where events - * sometimes fired off the handle, not the root. - **************************************************/ - -var Drag = { - - obj : null, - - init : function(o, oRoot, minX, maxX, minY, maxY, bSwapHorzRef, bSwapVertRef, fXMapper, fYMapper) - { - o.onmousedown = Drag.start; - - o.hmode = bSwapHorzRef ? false : true ; - o.vmode = bSwapVertRef ? false : true ; - - o.root = oRoot && oRoot != null ? oRoot : o ; - - if (o.hmode && isNaN(parseInt(o.root.style.left))) { - o.root.style.left = "0px"; - } - if (o.vmode && isNaN(parseInt(o.root.style.top))) { - o.root.style.top = "0px"; - } - if (!o.hmode && isNaN(parseInt(o.root.style.right))) { - o.root.style.right = "0px"; - } - if (!o.vmode && isNaN(parseInt(o.root.style.bottom))) { - o.root.style.bottom = "0px"; - } - - o.minX = typeof minX != 'undefined' ? minX : null; - o.minY = typeof minY != 'undefined' ? minY : null; - o.maxX = typeof maxX != 'undefined' ? maxX : null; - o.maxY = typeof maxY != 'undefined' ? maxY : null; - - o.xMapper = fXMapper ? fXMapper : null; - o.yMapper = fYMapper ? fYMapper : null; - - o.root.onDragStart = new Function(); - o.root.onDragEnd = new Function(); - o.root.onDrag = new Function(); - }, - - start : function(e) - { - var o = Drag.obj = this; - e = Drag.fixE(e); - var y = parseInt(o.vmode ? o.root.style.top : o.root.style.bottom); - var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right ); - o.root.onDragStart(x, y); - - o.lastMouseX = e.clientX; - o.lastMouseY = e.clientY; - - if (o.hmode) { - if (o.minX != null) { - o.minMouseX = e.clientX - x + o.minX; - } - if (o.maxX != null) { - o.maxMouseX = o.minMouseX + o.maxX - o.minX; - } - } else { - if (o.minX != null) { - o.maxMouseX = -o.minX + e.clientX + x; - } - if (o.maxX != null) { - o.minMouseX = -o.maxX + e.clientX + x; - } - } - - if (o.vmode) { - if (o.minY != null) { - o.minMouseY = e.clientY - y + o.minY; - } - if (o.maxY != null) { - o.maxMouseY = o.minMouseY + o.maxY - o.minY; - } - } else { - if (o.minY != null) { - o.maxMouseY = -o.minY + e.clientY + y; - } - if (o.maxY != null) { - o.minMouseY = -o.maxY + e.clientY + y; - } - } - - document.onmousemove = Drag.drag; - document.onmouseup = Drag.end; - - return false; - }, - - drag : function(e) - { - e = Drag.fixE(e); - var o = Drag.obj; - - var ey = e.clientY; - var ex = e.clientX; - var y = parseInt(o.vmode ? o.root.style.top : o.root.style.bottom); - var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right ); - var nx, ny; - - if (o.minX != null) { - ex = o.hmode ? - Math.max(ex, o.minMouseX) : Math.min(ex, o.maxMouseX); - } - if (o.maxX != null) { - ex = o.hmode ? - Math.min(ex, o.maxMouseX) : Math.max(ex, o.minMouseX); - } - if (o.minY != null) { - ey = o.vmode ? - Math.max(ey, o.minMouseY) : Math.min(ey, o.maxMouseY); - } - if (o.maxY != null) { - ey = o.vmode ? - Math.min(ey, o.maxMouseY) : Math.max(ey, o.minMouseY); - } - - nx = x + ((ex - o.lastMouseX) * (o.hmode ? 1 : -1)); - ny = y + ((ey - o.lastMouseY) * (o.vmode ? 1 : -1)); - - if (o.xMapper) { - nx = o.xMapper(y) - } else if (o.yMapper) { - ny = o.yMapper(x) - } - - Drag.obj.root.style[o.hmode ? "left" : "right"] = nx + "px"; - Drag.obj.root.style[o.vmode ? "top" : "bottom"] = ny + "px"; - Drag.obj.lastMouseX = ex; - Drag.obj.lastMouseY = ey; - - Drag.obj.root.onDrag(nx, ny); - return false; - }, - - end : function() - { - document.onmousemove = null; - document.onmouseup = null; - Drag.obj.root.onDragEnd( parseInt(Drag.obj.root.style[Drag.obj.hmode ? "left" : "right"]), - parseInt(Drag.obj.root.style[Drag.obj.vmode ? "top" : "bottom"])); - Drag.obj = null; - }, - - fixE : function(e) - { - if (typeof e == 'undefined') { - e = window.event; - } - if (typeof e.layerX == 'undefined') { - e.layerX = e.offsetX; - } - if (typeof e.layerY == 'undefined') { - e.layerY = e.offsetY; - } - return e; - } -}; diff --git a/js/functions.js b/js/functions.js index 1285059feb..ee16461001 100644 --- a/js/functions.js +++ b/js/functions.js @@ -876,6 +876,42 @@ function refreshLayout() $elm.css('height', pdfPaperSize(paper, posb) + 'px'); } +/** + * Initializes positions of elements. + */ +function TableDragInit() { + $('.pdflayout_table').each(function () { + var $this = $(this); + var number = $this.data('number'); + var x = $('#c_table_' + number + '_x').val(); + var y = $('#c_table_' + number + '_y').val(); + $this.css('left', x + 'px'); + $this.css('top', y + 'px'); + /* Make elements draggable */ + $this.draggable({ + containment: "parent", + drag: function (evt, ui) { + var number = $this.data('number'); + $('#c_table_' + number + '_x').val(parseInt(ui.position.left)); + $('#c_table_' + number + '_y').val(parseInt(ui.position.top)); + } + }); + }); +} + +/** + * Resets drag and drop positions. + */ +function resetDrag() { + $('.pdflayout_table').each(function () { + var $this = $(this); + var x = $this.data('x'); + var y = $this.data('y'); + $this.css('left', x + 'px'); + $this.css('top', y + 'px'); + }); +} + /** * User schema handlers. */ @@ -898,7 +934,8 @@ $(function () { $('#toggle-dragdrop').live('click', function () { var $elm = $('#pdflayout'); if ($elm.css('visibility') == 'hidden') { - PDFinit(); /* Defined in pdf_pages.php */ + refreshLayout(); + TableDragInit(); $elm.css('visibility', 'visible'); $elm.css('display', 'block'); $('#showwysiwyg').val('1'); diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 4574e2b2e0..d346de06c0 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -329,10 +329,10 @@ class PMA_User_Schema . "\n" . ' '; echo "\n" . ' '; echo "\n" . ' ' - . "\n" . ' '; + . "\n" . ' '; echo "\n" . ' '; echo "\n" . ' ' - . "\n" . ' '; + . "\n" . ' '; echo "\n" . ' '; echo "\n" . ' '; $i++; @@ -531,31 +531,25 @@ class PMA_User_Schema { global $with_field_names, $db; ?> -