Skip to content

Commit 0cab9f0

Browse files
arschmitzarschmitz
committed
Droppable: Style updates
Ref #14246
1 parent 85ff520 commit 0cab9f0

File tree

8 files changed

+116
-107
lines changed

8 files changed

+116
-107
lines changed

‎tests/unit/droppable/common-deprecated.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ common.testWidget( "droppable", {
2323
out: null,
2424
over: null
2525
}
26-
});
26+
} );
2727

2828
} );

‎tests/unit/droppable/common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ common.testWidget( "droppable", {
2121
out: null,
2222
over: null
2323
}
24-
});
24+
} );
2525

2626
} );

‎tests/unit/droppable/core.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ define( [
44
"ui/widgets/droppable"
55
], function( $, testHelper ) {
66

7-
module("droppable: core");
7+
module( "droppable: core" );
88

9-
test("element types", function() {
10-
var typeNames = ("p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form" +
9+
test( "element types", function() {
10+
var typeNames = ( "p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form" +
1111
",table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr" +
1212
",acronym,code,samp,kbd,var,img,hr" +
13-
",input,button,label,select,iframe").split(",");
13+
",input,button,label,select,iframe" ).split( "," );
1414

1515
expect( typeNames.length );
1616

17-
$.each(typeNames, function(i) {
18-
var typeName = typeNames[i],
19-
el = $(document.createElement(typeName)).appendTo("body");
17+
$.each( typeNames, function( i ) {
18+
var typeName = typeNames[ i ],
19+
el = $( document.createElement( typeName ) ).appendTo( "body" );
2020

21-
(typeName === "table" && el.append("<tr><td>content</td></tr>"));
21+
( typeName === "table" && el.append( "<tr><td>content</td></tr>" ) );
2222
el.droppable();
2323
testHelper.shouldDrop();
24-
el.droppable("destroy");
24+
el.droppable( "destroy" );
2525
el.remove();
26-
});
27-
});
26+
} );
27+
} );
2828

2929
} );

‎tests/unit/droppable/events.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ test( "droppable destruction/recreation on drop event", function( assert ) {
1313
drop: function() {
1414
var element = $( this ),
1515
newDroppable = $( "<div>" )
16-
.css({ width: 100, height: 100 })
16+
.css( { width: 100, height: 100 } )
1717
.text( "Droppable" );
1818
element.after( newDroppable );
1919
element.remove();
@@ -33,10 +33,10 @@ test( "droppable destruction/recreation on drop event", function( assert ) {
3333
draggable.simulate( "drag", {
3434
dx: dx,
3535
dy: dy
36-
});
36+
} );
3737

3838
assert.lacksClasses( droppable2, "active", "subsequent droppable no longer active" );
39-
});
39+
} );
4040

4141
// todo: comment the following in when ready to actually test
4242
/*

‎tests/unit/droppable/helper.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ define( [
55

66
return $.extend( helper, {
77
shouldDrop: function() {
8+
89
// todo: actually implement this
9-
ok(true, "missing test - untested code is broken code");
10+
ok( true, "missing test - untested code is broken code" );
1011
},
1112

1213
shouldNotDrop: function() {
14+
1315
// todo: actually implement this
14-
ok(true, "missing test - untested code is broken code");
16+
ok( true, "missing test - untested code is broken code" );
1517
}
1618
} );
1719

‎tests/unit/droppable/methods.js

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,78 +4,78 @@ define( [
44
"ui/widgets/droppable"
55
], function( $, testHelper ) {
66

7-
module("droppable: methods");
7+
module( "droppable: methods" );
88

9-
test("init", function() {
9+
test( "init", function() {
1010
expect( 5 );
1111

12-
$("<div></div>").appendTo("body").droppable().remove();
13-
ok(true, ".droppable() called on element");
12+
$( "<div></div>" ).appendTo( "body" ).droppable().remove();
13+
ok( true, ".droppable() called on element" );
1414

15-
$([]).droppable();
16-
ok(true, ".droppable() called on empty collection");
15+
$( [] ).droppable();
16+
ok( true, ".droppable() called on empty collection" );
1717

18-
$("<div></div>").droppable();
19-
ok(true, ".droppable() called on disconnected DOMElement");
18+
$( "<div></div>" ).droppable();
19+
ok( true, ".droppable() called on disconnected DOMElement" );
2020

21-
$("<div></div>").droppable().droppable("option", "foo");
22-
ok(true, "arbitrary option getter after init");
21+
$( "<div></div>" ).droppable().droppable( "option", "foo" );
22+
ok( true, "arbitrary option getter after init" );
2323

24-
$("<div></div>").droppable().droppable("option", "foo", "bar");
25-
ok(true, "arbitrary option setter after init");
26-
});
24+
$( "<div></div>" ).droppable().droppable( "option", "foo", "bar" );
25+
ok( true, "arbitrary option setter after init" );
26+
} );
2727

28-
test("destroy", function() {
28+
test( "destroy", function() {
2929
expect( 4 );
3030

31-
$("<div></div>").appendTo("body").droppable().droppable("destroy").remove();
32-
ok(true, ".droppable('destroy') called on element");
31+
$( "<div></div>" ).appendTo( "body" ).droppable().droppable( "destroy" ).remove();
32+
ok( true, ".droppable('destroy') called on element" );
3333

34-
$([]).droppable().droppable("destroy");
35-
ok(true, ".droppable('destroy') called on empty collection");
34+
$( [] ).droppable().droppable( "destroy" );
35+
ok( true, ".droppable('destroy') called on empty collection" );
3636

37-
$("<div></div>").droppable().droppable("destroy");
38-
ok(true, ".droppable('destroy') called on disconnected DOMElement");
37+
$( "<div></div>" ).droppable().droppable( "destroy" );
38+
ok( true, ".droppable('destroy') called on disconnected DOMElement" );
3939

40-
var expected = $("<div></div>").droppable(),
41-
actual = expected.droppable("destroy");
42-
equal(actual, expected, "destroy is chainable");
43-
});
40+
var expected = $( "<div></div>" ).droppable(),
41+
actual = expected.droppable( "destroy" );
42+
equal( actual, expected, "destroy is chainable" );
43+
} );
4444

45-
test("enable", function() {
46-
expect(7);
45+
test( "enable", function() {
46+
expect( 7 );
4747

4848
var el, expected, actual;
4949

50-
el = $("#droppable1").droppable({ disabled: true });
50+
el = $( "#droppable1" ).droppable( { disabled: true } );
5151
testHelper.shouldNotDrop();
52-
el.droppable("enable");
52+
el.droppable( "enable" );
5353
testHelper.shouldDrop();
54-
equal(el.droppable("option", "disabled"), false, "disabled option getter");
55-
el.droppable("destroy");
56-
el.droppable({ disabled: true });
54+
equal( el.droppable( "option", "disabled" ), false, "disabled option getter" );
55+
el.droppable( "destroy" );
56+
el.droppable( { disabled: true } );
5757
testHelper.shouldNotDrop();
58-
el.droppable("option", "disabled", false);
59-
equal(el.droppable("option", "disabled"), false, "disabled option setter");
58+
el.droppable( "option", "disabled", false );
59+
equal( el.droppable( "option", "disabled" ), false, "disabled option setter" );
6060
testHelper.shouldDrop();
6161

62-
expected = $("<div></div>").droppable(),
63-
actual = expected.droppable("enable");
64-
equal(actual, expected, "enable is chainable");
65-
});
62+
expected = $( "<div></div>" ).droppable(),
63+
actual = expected.droppable( "enable" );
64+
equal( actual, expected, "enable is chainable" );
65+
} );
6666

6767
test( "disable", function( assert ) {
6868
expect( 10 );
6969

7070
var actual, expected,
71-
element = $( "#droppable1" ).droppable({ disabled: false });
71+
element = $( "#droppable1" ).droppable( { disabled: false } );
7272

7373
testHelper.shouldDrop();
7474
element.droppable( "disable" );
7575
testHelper.shouldNotDrop();
7676
equal( element.droppable( "option", "disabled" ), true, "disabled option getter" );
7777
element.droppable( "destroy" );
78-
element.droppable({ disabled: false });
78+
element.droppable( { disabled: false } );
7979
testHelper.shouldDrop();
8080
element.droppable( "option", "disabled", true );
8181
assert.lacksClasses( element.droppable( "widget" ), "ui-state-disabled" );
@@ -87,6 +87,6 @@ test( "disable", function( assert ) {
8787
expected = $( "<div></div>" ).droppable();
8888
actual = expected.droppable( "disable" );
8989
equal( actual, expected, "disable is chainable" );
90-
});
90+
} );
9191

9292
} );

‎tests/unit/droppable/options.js

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ test( "activeClass", function() {
2424
*/
2525
test( "{ addClasses: true }, default", function( assert ) {
2626
expect( 1 );
27-
var el = $( "<div />" ).droppable({ addClasses: true });
27+
var el = $( "<div />" ).droppable( { addClasses: true } );
2828
assert.hasClasses( el, "ui-droppable" );
2929
el.droppable( "destroy" );
30-
});
30+
} );
3131

3232
test( "{ addClasses: false }", function( assert ) {
3333
expect( 1 );
34-
var el = $( "<div />" ).droppable({ addClasses: false });
34+
var el = $( "<div />" ).droppable( { addClasses: false } );
3535

3636
assert.lacksClasses( el, "ui-droppable" );
3737
el.droppable( "destroy" );
38-
});
38+
} );
3939

4040
test( "scope", function() {
4141
expect( 4 );
4242
var droppableOffset, draggableOffset, oldDraggableOffset, dx, dy,
43-
draggable1 = $( "<div />" ).appendTo( "#qunit-fixture" ).draggable({ revert: "invalid" }),
43+
draggable1 = $( "<div />" ).appendTo( "#qunit-fixture" ).draggable( { revert: "invalid" } ),
4444
draggable2 = $( "<div />" ).appendTo( "#qunit-fixture" ).droppable(),
4545
droppable = $( "<div />" ).appendTo( "#qunit-fixture" ).droppable(),
4646
newScope = "test";
@@ -57,7 +57,7 @@ test( "scope", function() {
5757
draggable1.simulate( "drag", {
5858
dx: dx,
5959
dy: dy
60-
});
60+
} );
6161

6262
draggableOffset = draggable1.offset();
6363
equal( draggableOffset.left, droppableOffset.left );
@@ -72,12 +72,12 @@ test( "scope", function() {
7272
draggable2.simulate( "drag", {
7373
dx: dx,
7474
dy: dy
75-
});
75+
} );
7676

7777
draggableOffset = draggable2.offset();
7878
equal( draggableOffset.left, oldDraggableOffset.left );
7979
equal( draggableOffset.top, oldDraggableOffset.top );
80-
});
80+
} );
8181
/*
8282
test( "greedy", function() {
8383
ok(false, 'missing test - untested code is broken code');
@@ -109,7 +109,7 @@ test( "tolerance, intersect", function() {
109109

110110
draggable = $( "<div />" )
111111
.appendTo( "#qunit-fixture" )
112-
.css({
112+
.css( {
113113
width: 10,
114114
height: 10,
115115
position: "absolute",
@@ -118,32 +118,32 @@ test( "tolerance, intersect", function() {
118118
// Droppable: droppable region is offset by draggables margin
119119
marginTop: 3,
120120
marginLeft: 3
121-
})
121+
} )
122122
.draggable();
123123

124124
droppable = $( "<div />" )
125125
.appendTo( "#qunit-fixture" )
126-
.css({ width: 10, height: 10, position: "absolute", top: 13, left: 13 })
127-
.droppable({ tolerance: "intersect" });
126+
.css( { width: 10, height: 10, position: "absolute", top: 13, left: 13 } )
127+
.droppable( { tolerance: "intersect" } );
128128

129129
$.each( dataset, function() {
130130
var data = this;
131131

132-
draggable.css({
132+
draggable.css( {
133133
top: 0,
134134
left: 0
135-
});
135+
} );
136136

137137
droppable.off( "drop" ).on( "drop", function() {
138138
equal( true, data[ 2 ], data[ 3 ] );
139-
});
139+
} );
140140

141141
$( draggable ).simulate( "drag", {
142142
dx: data[ 0 ],
143143
dy: data[ 1 ]
144-
});
145-
});
146-
});
144+
} );
145+
} );
146+
} );
147147

148148
test( "tolerance, pointer", function() {
149149
expect( 3 );
@@ -162,40 +162,40 @@ test( "tolerance, pointer", function() {
162162

163163
draggable = $( "<div />" )
164164
.appendTo( "#qunit-fixture" )
165-
.css({ width: 10, height: 10, position: "absolute" })
165+
.css( { width: 10, height: 10, position: "absolute" } )
166166
.draggable();
167167

168168
droppable = $( "<div />" )
169169
.appendTo( "#qunit-fixture" )
170-
.css({ width: 10, height: 10, position: "absolute", top: 5, left: 5 })
171-
.droppable({ tolerance: "pointer" });
170+
.css( { width: 10, height: 10, position: "absolute", top: 5, left: 5 } )
171+
.droppable( { tolerance: "pointer" } );
172172

173173
$.each( dataset, function() {
174174
var data = this;
175175

176176
droppable.off( "drop" ).on( "drop", function() {
177177
equal( true, data[ 2 ], data[ 3 ] );
178-
});
178+
} );
179179

180180
$( draggable ).simulate( "drag", {
181181
dx: ( data[ 0 ] - $( draggable ).position().left ),
182182
dy: ( data[ 1 ] - $( draggable ).position().top )
183-
});
184-
});
183+
} );
184+
} );
185185

186186
// Http://bugs.jqueryui.com/ticket/4977 - tolerance, pointer - bug when pointer outside draggable
187-
draggable.css({ top: 0, left: 0 }).draggable( "option", "axis", "x" );
188-
droppable.css({ top: 15, left: 15 });
187+
draggable.css( { top: 0, left: 0 } ).draggable( "option", "axis", "x" );
188+
droppable.css( { top: 15, left: 15 } );
189189

190190
droppable.off( "drop" ).on( "drop", function() {
191191
ok( true, "drop fires as long as pointer is within droppable" );
192-
});
192+
} );
193193

194194
$( draggable ).simulate( "drag", {
195195
dx: 10,
196196
dy: 10
197-
});
198-
});
197+
} );
198+
} );
199199

200200
/*
201201
test( "tolerance, touch", function() {

0 commit comments

Comments
 (0)