Skip to content

Commit 9da6e11

Browse files
committed
Update to dart libraries 0.9.0
1 parent 08b0f62 commit 9da6e11

File tree

8 files changed

+51
-48
lines changed

8 files changed

+51
-48
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Changelog
22
================
33

4+
## Version 0.3.5 (2013-11-11) ##
5+
* Update to dart libraries 0.9.0.
6+
47
## Version 0.3.4 (2013-10-08) ##
58
* Fix Issue #13: html5_dnd is incompatible with js-interop and the latest SDK
69
* Remove dependencies on meta package

example/html5_dnd_example.dart

+26-26
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ initLogging() {
4444
sectionDraggableAndDropzone() {
4545
// Install draggables (documents).
4646
DraggableGroup dragGroup = new DraggableGroup()
47-
..installAll(queryAll('#draggable-dropzone .document'));
47+
..installAll(querySelectorAll('#draggable-dropzone .document'));
4848

4949
// Install dropzone (trash).
5050
DropzoneGroup dropGroup = new DropzoneGroup()
51-
..install(query('#draggable-dropzone .trash'))
51+
..install(querySelector('#draggable-dropzone .trash'))
5252
..accept.add(dragGroup)
5353
..onDrop.listen((DropzoneEvent event) {
5454
event.draggable.remove();
@@ -59,35 +59,35 @@ sectionDraggableAndDropzone() {
5959
sectionDraggingDivs() {
6060
// Install draggable.
6161
DraggableGroup dragGroup = new DraggableGroup()
62-
..installAll(queryAll('#dragging-divs .dragme'));
62+
..install(querySelector('#dragging-divs .dragme'));
6363

6464
// Install dropzone.
6565
DropzoneGroup dropGroup = new DropzoneGroup()
66-
..install(query('#dragging-divs .dropzone'))
66+
..install(querySelector('#dragging-divs .dropzone'))
6767
..accept.add(dragGroup);
6868
}
6969

7070
sectionDropEffects() {
7171
// Install draggables.
7272
DraggableGroup dragGroupMove = new DraggableGroup()
7373
..dropEffect = DROP_EFFECT_MOVE
74-
..install(query('#drop-effects .move'));
74+
..install(querySelector('#drop-effects .move'));
7575

7676
DraggableGroup dragGroupCopy = new DraggableGroup()
7777
..dropEffect = DROP_EFFECT_COPY
78-
..install(query('#drop-effects .copy'));
78+
..install(querySelector('#drop-effects .copy'));
7979

8080
DraggableGroup dragGroupLink = new DraggableGroup()
8181
..dropEffect = DROP_EFFECT_LINK
82-
..install(query('#drop-effects .link'));
82+
..install(querySelector('#drop-effects .link'));
8383

8484
DraggableGroup dragGroupNone = new DraggableGroup()
8585
..dropEffect = DROP_EFFECT_NONE
86-
..install(query('#drop-effects .none'));
86+
..install(querySelector('#drop-effects .none'));
8787

8888
// Install dropzone.
8989
DropzoneGroup dropGroup = new DropzoneGroup()
90-
..install(query('#drop-effects .trash'))
90+
..install(querySelector('#drop-effects .trash'))
9191
..accept.addAll([dragGroupMove, dragGroupCopy, dragGroupLink, dragGroupNone])
9292
..onDrop.listen((DropzoneEvent event) {
9393
event.draggable.remove();
@@ -108,37 +108,37 @@ sectionDragImages() {
108108
// Install draggables.
109109
DraggableGroup dragGroupOne = new DraggableGroup(
110110
dragImageFunction: (Element draggable) => new DragImage(png, 40, 40))
111-
..install(query('#drag-images .one'));
111+
..install(querySelector('#drag-images .one'));
112112

113113
DraggableGroup dragGroupTwo = new DraggableGroup(
114114
dragImageFunction: (Element draggable) => new DragImage(png, -20, -20))
115-
..install(query('#drag-images .two'));
115+
..install(querySelector('#drag-images .two'));
116116

117117
DraggableGroup dragGroupThree = new DraggableGroup(
118118
dragImageFunction: (Element draggable) => new DragImage(canvasImage, 20, 20))
119-
..install(query('#drag-images .three'));
119+
..install(querySelector('#drag-images .three'));
120120

121121
// Install dropzone.
122122
DropzoneGroup dropGroup = new DropzoneGroup()
123-
..install(query('#drag-images .dropzone'))
123+
..install(querySelector('#drag-images .dropzone'))
124124
..accept.addAll([dragGroupOne, dragGroupTwo, dragGroupThree]);
125125
}
126126

127127
sectionNestedElements() {
128-
TextAreaElement textarea = query('#nested-elements .dropzone textarea');
129-
InputElement input = query('#nested-elements .dropzone input');
128+
TextAreaElement textarea = querySelector('#nested-elements .dropzone textarea');
129+
InputElement input = querySelector('#nested-elements .dropzone input');
130130
input.value = 'Drag here!';
131131
textarea.text = '';
132132
int enterLeaveCounter = 1;
133133
int overCounter = 1;
134134

135135
// Install draggables.
136136
DraggableGroup dragGroup = new DraggableGroup()
137-
..install(query('#nested-elements .dragme'));
137+
..install(querySelector('#nested-elements .dragme'));
138138

139139
// Install dropzone.
140140
DropzoneGroup dropGroup = new DropzoneGroup()
141-
..install(query('#nested-elements .dropzone'))
141+
..install(querySelector('#nested-elements .dropzone'))
142142
..accept.add(dragGroup)
143143
..onDragEnter.listen((DropzoneEvent event) {
144144
textarea.appendText('${enterLeaveCounter++} drag enter fired\n');
@@ -159,7 +159,7 @@ sectionNestedElements() {
159159

160160
sectionSortableList() {
161161
SortableGroup sortGroup = new SortableGroup()
162-
..installAll(queryAll('#sortable-list li'))
162+
..installAll(querySelectorAll('#sortable-list li'))
163163
..onSortUpdate.listen((SortableEvent event) {
164164
// do something when user sorted the elements...
165165
});
@@ -171,15 +171,15 @@ sectionSortableList() {
171171
sectionSortableGrid() {
172172
SortableGroup sortGroup = new SortableGroup()
173173
..isGrid = true
174-
..installAll(queryAll('#sortable-grid li'));
174+
..installAll(querySelectorAll('#sortable-grid li'));
175175

176176
// Only accept elements from this section.
177177
sortGroup.accept.add(sortGroup);
178178
}
179179

180180
sectionSortableListHandles() {
181181
SortableGroup sortGroup = new SortableGroup(handle: 'span')
182-
..installAll(queryAll('#sortable-list-handles li'));
182+
..installAll(querySelectorAll('#sortable-list-handles li'));
183183

184184
// Only accept elements from this section.
185185
sortGroup.accept.add(sortGroup);
@@ -189,22 +189,22 @@ sectionCancelDrag() {
189189
// Install draggable.
190190
DraggableGroup dragGroup = new DraggableGroup(
191191
cancel: 'textarea, button, .nodrag')
192-
..install(query('#cancel-drag .dragme'));
192+
..install(querySelector('#cancel-drag .dragme'));
193193
}
194194

195195
sectionSortableTwoGroups() {
196196
ImageElement png = new ImageElement(src: 'icons/smiley-happy.png');
197197

198198
SortableGroup sortGroup1 = new SortableGroup()
199-
..installAll(queryAll('#sortable-two-groups .group1 li'))
199+
..installAll(querySelectorAll('#sortable-two-groups .group1 li'))
200200
..onSortUpdate.listen((SortableEvent event) {
201201
event.originalGroup.uninstall(event.draggable);
202202
event.newGroup.install(event.draggable);
203203
});
204204

205205
SortableGroup sortGroup2 = new SortableGroup(
206206
dragImageFunction: (Element draggable) => new DragImage(png, 5, 5))
207-
..installAll(queryAll('#sortable-two-groups .group2 li'))
207+
..installAll(querySelectorAll('#sortable-two-groups .group2 li'))
208208
..onSortUpdate.listen((SortableEvent event) {
209209
if (event.originalGroup != event.newGroup) {
210210
event.originalGroup.uninstall(event.draggable);
@@ -219,22 +219,22 @@ sectionSortableTwoGroups() {
219219

220220

221221
_installCodeblockTabs() {
222-
List<AnchorElement> tabLinks = queryAll('.example-code .menu li a');
222+
List<AnchorElement> tabLinks = querySelectorAll('.example-code .menu li a');
223223
for (AnchorElement link in tabLinks) {
224224
link.onClick.listen((MouseEvent event) {
225225
event.preventDefault();
226226

227227
Element exampleCodeParent = link.parent.parent.parent;
228228

229229
// Remove active class on all menu and content tabs.
230-
exampleCodeParent.queryAll('[tab]').forEach((Element e) {
230+
exampleCodeParent.querySelectorAll('[tab]').forEach((Element e) {
231231
e.classes.remove('active');
232232
});
233233

234234
// Add active class.
235235
String currentTab = link.attributes['tab'];
236236
link.classes.add('active');
237-
exampleCodeParent.query('.content [tab="$currentTab"]').classes.add('active');
237+
exampleCodeParent.querySelector('.content [tab="$currentTab"]').classes.add('active');
238238
});
239239
}
240240
}

lib/src/dnd/draggable.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -345,14 +345,14 @@ List<StreamSubscription> _installDraggable(Element element, DraggableGroup group
345345
bool _isValidDragStartTarget(Element element, EventTarget target,
346346
String handle, String cancel) {
347347
if (handle != null) {
348-
List<Element> handles = element.queryAll(handle);
348+
List<Element> handles = element.querySelectorAll(handle);
349349
if (!handles.contains(target)) {
350350
return false;
351351
}
352352
}
353353

354354
if (cancel != null) {
355-
List<Element> cancels = element.queryAll(cancel);
355+
List<Element> cancels = element.querySelectorAll(cancel);
356356
if (cancels.contains(target)) {
357357
return false;
358358
}

pubspec.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: html5_dnd
2-
version: 0.3.4+1
2+
version: 0.3.5
33
author: Marco Jakob <[email protected]>
44
description: HTML5 Drag and Drop
55
homepage: https://github.com/marcojakob/dart-html5-dnd
66
documentation: http://edu.makery.ch/projects/dart-html5-drag-and-drop
77
dependencies:
8-
logging: '>=0.7.6'
8+
logging: '>=0.9.0 <0.10.0'
99
dev_dependencies:
10-
browser: '>=0.7.6'
11-
intl: any
10+
browser: '>=0.9.0 <0.10.0'
11+
intl: '>=0.9.0 <0.10.0'

test/complex_elements/complex_elements_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ initLogging() {
3131

3232
void installDragAndDrop() {
3333
SortableGroup sortGroup = new SortableGroup()
34-
..installAll(queryAll('.group'))
34+
..installAll(querySelectorAll('.group'))
3535
..onSortUpdate.listen((SortableEvent event) {
3636
int originalIndex = event.originalPosition.index;
3737
int newIndex = event.newPosition.index;

test/multi_lists/multi_groups_test.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ initLogging() {
2828

2929
void installDragAndDrop() {
3030
SortableGroup groupA = new SortableGroup()
31-
..installAll(queryAll('#group-a-sort li'))
31+
..installAll(querySelectorAll('#group-a-sort li'))
3232
..forcePlaceholderSize = false
3333
..onSortUpdate.listen((SortableEvent event) {
3434
if (event.originalGroup != event.newGroup) {
@@ -38,7 +38,7 @@ void installDragAndDrop() {
3838
});
3939

4040
SortableGroup groupB = new SortableGroup()
41-
..installAll(queryAll('#group-b-sort li'))
41+
..installAll(querySelectorAll('#group-b-sort li'))
4242
..forcePlaceholderSize = false
4343
..onSortUpdate.listen((SortableEvent event) {
4444
if (event.originalGroup != event.newGroup) {
@@ -48,7 +48,7 @@ void installDragAndDrop() {
4848
});
4949

5050
DraggableGroup groupC = new DraggableGroup()
51-
..installAll(queryAll('#group-c-drag li'));
51+
..installAll(querySelectorAll('#group-c-drag li'));
5252

5353
groupA.accept.add(groupB);
5454
groupB.accept.addAll([groupA, groupB, groupC]);

test/nested_dropzones/nested_dropzones_test.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@ initLogging() {
3232
void installDragAndDrop() {
3333
// Install draggables.
3434
DraggableGroup dragGroup1 = new DraggableGroup()
35-
..installAll(queryAll('.draggable1'));
35+
..installAll(querySelectorAll('.draggable1'));
3636

3737
DraggableGroup dragGroup2 = new DraggableGroup()
38-
..installAll(queryAll('.draggable2'));
38+
..installAll(querySelectorAll('.draggable2'));
3939

4040
// Install dropzones.
4141
DropzoneGroup dropGroup1 = new DropzoneGroup()
42-
..install(query('.container'))
42+
..install(querySelector('.container'))
4343
..accept.add(dragGroup1)
4444
..onDrop.listen((DropzoneEvent event) {
45-
event.dropzone.query('span').text = '!!dropped!!';
45+
event.dropzone.querySelector('span').text = '!!dropped!!';
4646
});
4747

4848
DropzoneGroup dropGroup2 = new DropzoneGroup()
49-
..install(query('.child'))
49+
..install(querySelector('.child'))
5050
..accept.add(dragGroup2)
5151
..onDrop.listen((DropzoneEvent event) {
52-
event.dropzone.query('span').text = '!!dropped!!';
52+
event.dropzone.querySelector('span').text = '!!dropped!!';
5353
});
5454
}

test/svg/svg_test.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@ initLogging() {
3232

3333
void installSvg() {
3434
var svgDragGroup = new DraggableGroup()
35-
..install(query('#draggable-svg'));
35+
..install(querySelector('#draggable-svg'));
3636

3737
var divDragGroup = new DraggableGroup()
38-
..install(query('#draggable-div'));
38+
..install(querySelector('#draggable-div'));
3939

4040
new DropzoneGroup()
41-
..install(query('#svg-dropzone'))
42-
..install(query('#div-dropzone'))
41+
..install(querySelector('#svg-dropzone'))
42+
..install(querySelector('#div-dropzone'))
4343
..accept.add(svgDragGroup)
4444
..accept.add(divDragGroup);
4545
}
4646

4747
void installSvgWithin() {
4848
var svgDragGroup = new DraggableGroup()
49-
..install(query('#drag-within-svg'));
49+
..install(querySelector('#drag-within-svg'));
5050

5151
new DropzoneGroup()
52-
..install(query('#drop-within-svg'))
52+
..install(querySelector('#drop-within-svg'))
5353
..accept.add(svgDragGroup);
5454
}

0 commit comments

Comments
 (0)