Changeset 4205

Timestamp:

12/17/07 15:37:26 (1 year ago)

Author:

paul.bakaus

Message:

- containment option works fine again (hopefully)

Location:

trunk/ui/experimental/mouse

Files:

• drag.html (modified) (2 diffs)
• ui.draggable.ext.js (modified) (1 diff)
• ui.draggable.js (modified) (3 diffs)

trunk/ui/experimental/mouse/drag.html

@@ -36 +36 @@
             height: 400px;
             border: 10px solid black;
-            overflow: scroll;
             position: absolute;
             left: 100px;
@@ -65 +64 @@
                 },
                 cursor: 'move',
-                containment: 'parent',
+                containment: { top: 10, left: 10, right: 10, bottom: 10 },
                 //axis: 'x',
                 //grid: [20,20],

trunk/ui/experimental/mouse/ui.draggable.ext.js

@@ -113 +113 @@
             
             if(c.constructor == Array) {
-
-
                 if((ui.absolutePosition.left < c[0])) self.position.left = c[0] - (self.offset.left - self.clickOffset.left);
                 if((ui.absolutePosition.top < c[1])) self.position.top = c[1] - (self.offset.top - self.clickOffset.top);
-                //if(ui.draggable.pos[0]+h[0].offsetWidth > c[2]-o.po.left) ui.draggable.pos[0] = c[2]-o.po.left-h[0].offsetWidth;
-                //if(ui.draggable.pos[1]+h[0].offsetHeight > c[3]-o.po.top) ui.draggable.pos[1] = c[3]-o.po.top-h[0].offsetHeight;
-
+                if(ui.absolutePosition.left - c[2] + self.helperProportions.width >= 0) self.position.left = c[2] - (self.offset.left - self.clickOffset.left) - self.helperProportions.width;
+                if(ui.absolutePosition.top - c[3] + self.helperProportions.height >= 0) self.position.top = c[3] - (self.offset.top - self.clickOffset.top) - self.helperProportions.height;
             } else {
-
-                if(c.left && (ui.draggable.pos[0] < c.left)) ui.draggable.pos[0] = c.left;
-                if(c.top && (ui.draggable.pos[1] < c.top)) ui.draggable.pos[1] = c.top;
-
-                var p = $(o.pp);
-                if(c.right && ui.draggable.pos[0]+h[0].offsetWidth > p[0].offsetWidth-c.right) ui.draggable.pos[0] = (p[0].offsetWidth-c.right)-h[0].offsetWidth;
-                if(c.bottom && ui.draggable.pos[1]+h[0].offsetHeight > p[0].offsetHeight-c.bottom) ui.draggable.pos[1] = (p[0].offsetHeight-c.bottom)-h[0].offsetHeight;
-
+                if((ui.position.left < c.left)) self.position.left = c.left;
+                if((ui.position.top < c.top)) self.position.top = c.top;
+                if(ui.position.left - self.offsetParent.innerWidth() + self.helperProportions.width + c.right + (parseInt(self.offsetParent.css("borderLeftWidth")) || 0) + (parseInt(self.offsetParent.css("borderRightWidth")) || 0) >= 0) self.position.left = self.offsetParent.innerWidth() - self.helperProportions.width - c.right - (parseInt(self.offsetParent.css("borderLeftWidth")) || 0) - (parseInt(self.offsetParent.css("borderRightWidth")) || 0);
+                if(ui.position.top - self.offsetParent.innerHeight() + self.helperProportions.height + c.bottom + (parseInt(self.offsetParent.css("borderTopWidth")) || 0) + (parseInt(self.offsetParent.css("borderBottomWidth")) || 0) >= 0) self.position.top = self.offsetParent.innerHeight() - self.helperProportions.height - c.bottom - (parseInt(self.offsetParent.css("borderTopWidth")) || 0) - (parseInt(self.offsetParent.css("borderBottomWidth")) || 0);
             }
-
 
         }

trunk/ui/experimental/mouse/ui.draggable.js

@@ -50 +50 @@
             return {
                 helper: this.helper,
-                position: { left: this.position, top: this.position },
+                position: this.position,
                 absolutePosition: this.positionAbs,
                 instance: this,
@@ -82 +82 @@
 
             //Find out the next positioned parent
-            var offsetParent = (function(cp) {
+            this.offsetParent = (function(cp) {
                 while(cp) {
                     if(cp.style && /(absolute|relative|fixed)/.test($.css(cp,'position'))) return $(cp);
@@ -98 +98 @@
             //Generate the original position
             this.originalPosition = {
-                left: (r ? parseInt(this.helper.css('left')) || 0 : elementPosition.left + (offsetParent[0] == document.body ? 0 : offsetParent[0].scrollLeft)),
-                top: (r ? parseInt(this.helper.css('top')) || 0 : elementPosition.top + (offsetParent[0] == document.body ? 0 : offsetParent[0].scrollTop))
+                left: (r ? parseInt(this.helper.css('left')) || 0 : elementPosition.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft)),
+                top: (r ? parseInt(this.helper.css('top')) || 0 : elementPosition.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop))
             };