Use rectChecker for 'self' origin and restriction

taye · taye · commit 36bf6fd953f6 · 2014-11-06T14:23:10.000Z
diff --git a/interact.js b/interact.js
@@ -778,7 +778,9 @@
             origin = element.parentNode;
         }
         else if (origin === 'self') {
-            origin = element;
+            origin = interactable.getRect(element);
+            origin.x = origin.left;
+            origin.y = origin.top;
         }
         else if (trySelector(origin)) {
             origin = matchingParent(element, origin) || { x: 0, y: 0 };
@@ -2619,7 +2621,7 @@
                     restriction = this.element.parentNode;
                 }
                 else if (restriction === 'self') {
-                    restriction = this.element;
+                    restriction = target.getRect(this.element);
                 }
                 else {
                     restriction = matchingParent(this.element, restriction);

Original file line number	Diff line number	Diff line change
`@@ -778,7 +778,9 @@`
`778`	`778`	`origin = element.parentNode;`
`779`	`779`	`}`
`780`	`780`	`else if (origin === 'self') {`
`781`		`- origin = element;`
	`781`	`+ origin = interactable.getRect(element);`
	`782`	`+ origin.x = origin.left;`
	`783`	`+ origin.y = origin.top;`
`782`	`784`	`}`
`783`	`785`	`else if (trySelector(origin)) {`
`784`	`786`	`origin = matchingParent(element, origin) \|\| { x: 0, y: 0 };`
`@@ -2619,7 +2621,7 @@`
`2619`	`2621`	`restriction = this.element.parentNode;`
`2620`	`2622`	`}`
`2621`	`2623`	`else if (restriction === 'self') {`
`2622`		`- restriction = this.element;`
	`2624`	`+ restriction = target.getRect(this.element);`
`2623`	`2625`	`}`
`2624`	`2626`	`else {`
`2625`	`2627`	`restriction = matchingParent(this.element, restriction);`