@@ -21,7 +21,8 @@ test("{ addClasses: false }", function() {
21
21
el . draggable ( "destroy" ) ;
22
22
} ) ;
23
23
24
- test ( "{ appendTo: 'parent' }, default" , function ( ) {
24
+ // TODO: This doesn't actually test whether append happened, possibly remove
25
+ test ( "{ appendTo: 'parent' }, default, no clone" , function ( ) {
25
26
expect ( 2 ) ;
26
27
var el = $ ( "#draggable2" ) . draggable ( { appendTo : "parent" } ) ;
27
28
TestHelpers . draggable . shouldMove ( el ) ;
@@ -31,16 +32,19 @@ test("{ appendTo: 'parent' }, default", function() {
31
32
32
33
} ) ;
33
34
34
- test ( "{ appendTo: Element }" , function ( ) {
35
+ // TODO: This doesn't actually test whether append happened, possibly remove
36
+ test ( "{ appendTo: Element }, no clone" , function ( ) {
35
37
expect ( 2 ) ;
36
- var el = $ ( "#draggable2" ) . draggable ( { appendTo : $ ( "#draggable2" ) . parent ( ) [ 0 ] } ) ;
38
+ var el = $ ( "#draggable2" ) . draggable ( { appendTo : $ ( "#draggable2" ) . parent ( ) [ 0 ] } ) ;
39
+
37
40
TestHelpers . draggable . shouldMove ( el ) ;
38
41
39
42
el = $ ( "#draggable1" ) . draggable ( { appendTo : $ ( "#draggable2" ) . parent ( ) [ 0 ] } ) ;
40
43
TestHelpers . draggable . shouldMove ( el ) ;
41
44
} ) ;
42
45
43
- test ( "{ appendTo: Selector }" , function ( ) {
46
+ // TODO: This doesn't actually test whether append happened, possibly remove
47
+ test ( "{ appendTo: Selector }, no clone" , function ( ) {
44
48
expect ( 2 ) ;
45
49
var el = $ ( "#draggable2" ) . draggable ( { appendTo : "#main" } ) ;
46
50
TestHelpers . draggable . shouldMove ( el ) ;
@@ -49,6 +53,83 @@ test("{ appendTo: Selector }", function() {
49
53
TestHelpers . draggable . shouldMove ( el ) ;
50
54
} ) ;
51
55
56
+ test ( "{ appendTo: 'parent' }, default" , function ( ) {
57
+
58
+ expect ( 2 ) ;
59
+
60
+ var el = $ ( "#draggable1" ) . draggable ( ) ;
61
+
62
+ TestHelpers . draggable . trackAppendedParent ( el ) ;
63
+
64
+ equal ( el . draggable ( "option" , "appendTo" ) , "parent" ) ;
65
+
66
+ TestHelpers . draggable . move ( el , 1 , 1 ) ;
67
+ equal ( el . data ( "last_parent" ) , $ ( "#qunit-fixture" ) [ 0 ] ) ;
68
+
69
+ } ) ;
70
+
71
+ test ( "{ appendTo: Element }" , function ( ) {
72
+
73
+ expect ( 1 ) ;
74
+
75
+ var appendTo = $ ( "#draggable2" ) . parent ( ) [ 0 ] ,
76
+ el = $ ( "#draggable1" ) . draggable ( { appendTo : appendTo } ) ;
77
+
78
+ TestHelpers . draggable . trackAppendedParent ( el ) ;
79
+
80
+ TestHelpers . draggable . move ( el , 1 , 1 ) ;
81
+ equal ( el . data ( "last_parent" ) , appendTo ) ;
82
+
83
+ } ) ;
84
+
85
+ test ( "{ appendTo: jQuery }" , function ( ) {
86
+
87
+ expect ( 1 ) ;
88
+
89
+ var appendTo = $ ( "#draggable2" ) . parent ( ) ,
90
+ el = $ ( "#draggable1" ) . draggable ( { appendTo : appendTo } ) ;
91
+
92
+ TestHelpers . draggable . trackAppendedParent ( el ) ;
93
+
94
+ TestHelpers . draggable . move ( el , 1 , 1 ) ;
95
+ equal ( el . data ( "last_parent" ) , appendTo [ 0 ] ) ;
96
+
97
+ } ) ;
98
+ test ( "{ appendTo: Selector }" , function ( ) {
99
+
100
+ expect ( 1 ) ;
101
+
102
+
103
+ var appendTo = "#main" ,
104
+ el = $ ( "#draggable1" ) . draggable ( { appendTo : appendTo } ) ;
105
+
106
+ TestHelpers . draggable . trackAppendedParent ( el ) ;
107
+
108
+ TestHelpers . draggable . move ( el , 1 , 1 ) ;
109
+ equal ( el . data ( "last_parent" ) , $ ( appendTo ) [ 0 ] ) ;
110
+
111
+ } ) ;
112
+
113
+
114
+ test ( "{ appendTo: 'parent' }, switching after initialization" , function ( ) {
115
+
116
+ expect ( 2 ) ;
117
+
118
+ var el = $ ( "#draggable1" ) . draggable ( { helper : "clone" } ) ;
119
+
120
+ TestHelpers . draggable . trackAppendedParent ( el ) ;
121
+
122
+ // Move and make sure el was appended to fixture
123
+ TestHelpers . draggable . move ( el , 1 , 1 ) ;
124
+ equal ( el . data ( "last_parent" ) , $ ( "#qunit-fixture" ) [ 0 ] ) ;
125
+
126
+ // Move and make sure el was appended to main
127
+ el . draggable ( "option" , "appendTo" , $ ( "#main" ) ) ;
128
+ TestHelpers . draggable . move ( el , 2 , 2 ) ;
129
+ equal ( el . data ( "last_parent" ) , $ ( "#main" ) [ 0 ] ) ;
130
+
131
+ } ) ;
132
+
52
133
test ( "{ axis: false }, default" , function ( ) {
53
134
expect ( 1 ) ;
54
135
var el = $ ( "#draggable2" ) . draggable ( { axis : false } ) ;
@@ -87,6 +168,26 @@ test("{ axis: ? }, unexpected", function() {
87
168
} ) ;
88
169
} ) ;
89
170
171
+ test ( "{ axis: false }, switching after initialization" , function ( ) {
172
+
173
+ expect ( 3 ) ;
174
+
175
+ var el ;
176
+
177
+ // Any direction
178
+ el = $ ( "#draggable1" ) . draggable ( { axis : false } ) ;
179
+ TestHelpers . draggable . testDrag ( el , el , 50 , 50 , 50 , 50 ) ;
180
+
181
+ // Only horizontal
182
+ el . draggable ( "option" , "axis" , "x" ) ;
183
+ TestHelpers . draggable . testDrag ( el , el , 50 , 50 , 50 , 0 ) ;
184
+
185
+ // Vertical only
186
+ el . draggable ( "option" , "axis" , "y" ) ;
187
+ TestHelpers . draggable . testDrag ( el , el , 50 , 50 , 0 , 50 ) ;
188
+
189
+ } ) ;
190
+
90
191
test ( "{ cancel: 'input,textarea,button,select,option' }, default" , function ( ) {
91
192
expect ( 2 ) ;
92
193
0 commit comments