forked from ariatemplates/ariatemplates
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix ariatemplates#1178 multiple issues when dragging within a parent …
…container that is scrollable Also partly fixes ariatemplates#695 one of the failing test for IE7/8: test.aria.utils.dragdrop.OutOfBoundaryTest now passes
- Loading branch information
1 parent
9dba9f6
commit 2a74c19
Showing
7 changed files
with
328 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
test/aria/utils/dragdrop/ScrollIntoViewDragDropCSS.tpl.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Copyright 2012 Amadeus s.a.s. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| {CSSTemplate { | ||
| $classpath : "test.aria.utils.dragdrop.ScrollIntoViewDragDropCSS" | ||
| }} | ||
|
|
||
| {macro main()} | ||
| .boundary1 { | ||
| float: left; | ||
| width: 300px; | ||
| height: 600px; | ||
| border: 1px solid #cdcdcd; | ||
| overflow-x: hidden; | ||
| overflow-y: auto; | ||
| } | ||
|
|
||
| .boundary2 { | ||
| width: 650px; | ||
| height: 200px; | ||
| border: 1px solid #cdcdcd; | ||
| overflow-x: auto; | ||
| overflow-y: hidden; | ||
| white-space:nowrap; | ||
| } | ||
|
|
||
| .constrained-draggable-class1 { | ||
| width : 270px; | ||
| height: 200px; | ||
| border: 1px solid #ddd; | ||
| background-color: #eee; | ||
| padding: 5px; | ||
| } | ||
| .constrained-draggable-class2 { | ||
| width : 270px; | ||
| height: 200px; | ||
| border: 1px solid #ddd; | ||
| background-color: #eee; | ||
| padding: 5px; | ||
| display: inline-block; | ||
| } | ||
|
|
||
| {/macro} | ||
|
|
||
| {/CSSTemplate} |
42 changes: 42 additions & 0 deletions
42
test/aria/utils/dragdrop/ScrollIntoViewDragTestTemplate.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Copyright 2012 Amadeus s.a.s. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| {Template { | ||
| $classpath : "test.aria.utils.dragdrop.ScrollIntoViewDragTestTemplate", | ||
| $css : ["test.aria.utils.dragdrop.ScrollIntoViewDragDropCSS"], | ||
| $hasScript : true | ||
| } } | ||
|
|
||
| {macro main ( )} | ||
|
|
||
| <div id="first-boundary", class="boundary1"> | ||
| <div id="constrained-draggable1" class="constrained-draggable-class1">Drag One</div> | ||
| <div id="constrained-draggable2" class="constrained-draggable-class1">Drag Two</div> | ||
| <div id="constrained-draggable3" class="constrained-draggable-class1">Drag Three</div> | ||
| <div id="constrained-draggable4" class="constrained-draggable-class1">Drag Four</div> | ||
| <div id="constrained-draggable5" class="constrained-draggable-class1">Drag Five</div> | ||
| </div> | ||
|
|
||
| <div id="second-boundary", class="boundary2"> | ||
| <div id="constrained-draggable6" class="constrained-draggable-class2">Drag One</div> | ||
| <div id="constrained-draggable7" class="constrained-draggable-class2">Drag Two</div> | ||
| <div id="constrained-draggable8" class="constrained-draggable-class2">Drag Three</div> | ||
| <div id="constrained-draggable9" class="constrained-draggable-class2">Drag Four</div> | ||
| <div id="constrained-draggable10" class="constrained-draggable-class2">Drag Five</div> | ||
| </div> | ||
|
|
||
| {/macro} | ||
|
|
||
| {/Template} |
26 changes: 26 additions & 0 deletions
26
test/aria/utils/dragdrop/ScrollIntoViewDragTestTemplateScript.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| Aria.tplScriptDefinition({ | ||
| $classpath : "test.aria.utils.dragdrop.ScrollIntoViewDragTestTemplateScript", | ||
| $dependencies : ["aria.utils.Mouse", "aria.utils.dragdrop.Drag"], | ||
| $destructor : function () { | ||
| this._dragFive.$dispose(); | ||
| this._dragTen.$dispose(); | ||
| }, | ||
| $prototype : { | ||
| $displayReady : function () { | ||
| this._dragFive = new aria.utils.dragdrop.Drag("constrained-draggable5", { | ||
| cursor : "move", | ||
| proxy : { | ||
| type : "CloneOverlay" | ||
| }, | ||
| constrainTo : "first-boundary" | ||
| }); | ||
| this._dragTen = new aria.utils.dragdrop.Drag("constrained-draggable10", { | ||
| cursor : "move", | ||
| proxy : { | ||
| type : "CloneOverlay" | ||
| }, | ||
| constrainTo : "second-boundary" | ||
| }); | ||
| } | ||
| } | ||
| }); |
Oops, something went wrong.