mirror of
https://github.com/dart-lang/sdk
synced 2024-09-16 03:36:59 +00:00
Dart DOM: Rename query to queryAll and queryOne to query.
BUG=None TEST=None Review URL: https://chromereviews.googleplex.com/3517023 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@77 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
parent
ebd67ed258
commit
3501cc95ce
|
@ -125,7 +125,7 @@ class Adminz {
|
|||
static String _getPrefix(Window window) {
|
||||
Document document = window.document;
|
||||
String name = '/Adminz.app';
|
||||
NodeList items = document.query('script');
|
||||
NodeList items = document.queryAll('script');
|
||||
for (int i = 0, n = items.length; i < n; ++i) {
|
||||
ScriptElement s = items[i];
|
||||
String src = s.src;
|
||||
|
|
|
@ -65,7 +65,7 @@ class SuiteController {
|
|||
// to .innerHTML update above.
|
||||
_element = div.nodes.first;
|
||||
|
||||
document.queryOne('#main').nodes.add(div);
|
||||
document.query('#main').nodes.add(div);
|
||||
}
|
||||
|
||||
DivElement _createDiv(String clazz) {
|
||||
|
@ -97,8 +97,8 @@ class Dromaeo {
|
|||
|
||||
run() {
|
||||
// TODO(antonm): create Re-run tests href.
|
||||
document.queryOne('#overview').elements.first.innerHTML = 'DOM Core Tests';
|
||||
_css(document.queryOne('#tests'), 'display', 'none');
|
||||
document.query('#overview').elements.first.innerHTML = 'DOM Core Tests';
|
||||
_css(document.query('#tests'), 'display', 'none');
|
||||
for (SuiteDescription suite in Suites.SUITE_DESCRIPTIONS) {
|
||||
final iframe = document.createElement('iframe');
|
||||
_css(iframe, 'height', '1px');
|
||||
|
@ -123,11 +123,11 @@ class Dromaeo {
|
|||
final mins = (estimatedTimeSecs / 60).floor().toInt();
|
||||
final secs = (estimatedTimeSecs - mins * 60).round().toInt();
|
||||
final secsAsString = (secs < 10 ? '0' : '') + secs;
|
||||
document.queryOne('#left').innerHTML = '${mins}:${secsAsString}';
|
||||
document.query('#left').innerHTML = '${mins}:${secsAsString}';
|
||||
|
||||
final elapsed = totalTimeSecs - estimatedTimeSecs;
|
||||
final percent = (100 * elapsed / totalTimeSecs).toStringAsFixed(2);
|
||||
_css(document.queryOne('#timebar'), 'width', '${percent}%');
|
||||
_css(document.query('#timebar'), 'width', '${percent}%');
|
||||
}
|
||||
|
||||
Function loading, running, done;
|
||||
|
|
|
@ -5,8 +5,8 @@ class Main {
|
|||
// Try to force real results.
|
||||
var ret;
|
||||
window.on.load.add((Event evt) {
|
||||
Element elem = document.queryOne('#test1');
|
||||
Element a = document.queryOne('a');
|
||||
Element elem = document.query('#test1');
|
||||
Element a = document.query('a');
|
||||
|
||||
new Suite('dom-attr')
|
||||
.test('getAttribute', void _() {
|
||||
|
|
|
@ -25,73 +25,73 @@ class Main {
|
|||
})
|
||||
.test('getElementById', () {
|
||||
for (int i = 0; i < num * 30; i++) {
|
||||
ret = document.queryOne('#testA' + num).tagName;
|
||||
ret = document.queryOne('#testB' + num).tagName;
|
||||
ret = document.queryOne('#testC' + num).tagName;
|
||||
ret = document.queryOne('#testD' + num).tagName;
|
||||
ret = document.queryOne('#testE' + num).tagName;
|
||||
ret = document.queryOne('#testF' + num).tagName;
|
||||
ret = document.query('#testA' + num).tagName;
|
||||
ret = document.query('#testB' + num).tagName;
|
||||
ret = document.query('#testC' + num).tagName;
|
||||
ret = document.query('#testD' + num).tagName;
|
||||
ret = document.query('#testE' + num).tagName;
|
||||
ret = document.query('#testF' + num).tagName;
|
||||
}
|
||||
})
|
||||
.test('getElementById (not in document)', () {
|
||||
for (int i = 0; i < num * 30; i++) {
|
||||
ret = document.queryOne('#testA');
|
||||
ret = document.queryOne('#testB');
|
||||
ret = document.queryOne('#testC');
|
||||
ret = document.queryOne('#testD');
|
||||
ret = document.queryOne('#testE');
|
||||
ret = document.queryOne('#testF');
|
||||
ret = document.query('#testA');
|
||||
ret = document.query('#testB');
|
||||
ret = document.query('#testC');
|
||||
ret = document.query('#testD');
|
||||
ret = document.query('#testE');
|
||||
ret = document.query('#testF');
|
||||
}
|
||||
})
|
||||
.test('getElementsByTagName(div)', () {
|
||||
for (int i = 0; i < num; i++) {
|
||||
var elems = document.query('div');
|
||||
var elems = document.queryAll('div');
|
||||
ret = elems[elems.length-1].nodeType;
|
||||
}
|
||||
})
|
||||
.test('getElementsByTagName(p)', () {
|
||||
for (int i = 0; i < num; i++) {
|
||||
final elems = document.query('p');
|
||||
final elems = document.queryAll('p');
|
||||
ret = elems[elems.length-1].nodeType;
|
||||
}
|
||||
})
|
||||
.test('getElementsByTagName(a)', () {
|
||||
for (int i = 0; i < num; i++) {
|
||||
var elems = document.query('a');
|
||||
var elems = document.queryAll('a');
|
||||
ret = elems[elems.length-1].nodeType;
|
||||
}
|
||||
})
|
||||
.test('getElementsByTagName(*)', () {
|
||||
for (int i = 0; i < num; i++) {
|
||||
var elems = document.query('*');
|
||||
var elems = document.queryAll('*');
|
||||
ret = elems[elems.length-1].nodeType;
|
||||
}
|
||||
})
|
||||
.test('getElementsByTagName (not in document)', () {
|
||||
for (int i = 0; i < num; i++) {
|
||||
var elems = document.query('strong');
|
||||
var elems = document.queryAll('strong');
|
||||
ret = elems.length == 0;
|
||||
}
|
||||
})
|
||||
.test('getElementsByName', () {
|
||||
for (int i = 0; i < num * 20; i++) {
|
||||
var elems = document.query('[name=test$num]');
|
||||
var elems = document.queryAll('[name=test$num]');
|
||||
ret = elems[elems.length-1].nodeType;
|
||||
elems = document.query('[name=test$num]');
|
||||
elems = document.queryAll('[name=test$num]');
|
||||
ret = elems[elems.length-1].nodeType;
|
||||
elems = document.query('[name=test$num]');
|
||||
elems = document.queryAll('[name=test$num]');
|
||||
ret = elems[elems.length-1].nodeType;
|
||||
elems = document.query('[name=test$num]');
|
||||
elems = document.queryAll('[name=test$num]');
|
||||
ret = elems[elems.length-1].nodeType;
|
||||
}
|
||||
})
|
||||
.test('getElementsByName (not in document)', () {
|
||||
for (int i = 0; i < num * 20; i++) {
|
||||
ret = document.query('[name=test]').length == 0;
|
||||
ret = document.query('[name=test]').length == 0;
|
||||
ret = document.query('[name=test]').length == 0;
|
||||
ret = document.query('[name=test]').length == 0;
|
||||
ret = document.query('[name=test]').length == 0;
|
||||
ret = document.queryAll('[name=test]').length == 0;
|
||||
ret = document.queryAll('[name=test]').length == 0;
|
||||
ret = document.queryAll('[name=test]').length == 0;
|
||||
ret = document.queryAll('[name=test]').length == 0;
|
||||
ret = document.queryAll('[name=test]').length == 0;
|
||||
}
|
||||
})
|
||||
.end();
|
||||
|
|
|
@ -50,7 +50,7 @@ interface Document extends Element /*, common.NodeSelector */ {
|
|||
|
||||
StyleSheetList get styleSheets();
|
||||
|
||||
// TODO(jacobr): should this be removed? Users could write document.queryOne("title").text instead.
|
||||
// TODO(jacobr): should this be removed? Users could write document.query("title").text instead.
|
||||
String get title();
|
||||
|
||||
void set title(String value);
|
||||
|
|
|
@ -6,7 +6,7 @@ interface DocumentFragment extends Node factory DocumentFragmentWrappingImplemen
|
|||
|
||||
DocumentFragment();
|
||||
|
||||
Element queryOne(String selectors);
|
||||
Element query(String selectors);
|
||||
|
||||
ElementList query(String selectors);
|
||||
ElementList queryAll(String selectors);
|
||||
}
|
||||
|
|
|
@ -10,11 +10,11 @@ class DocumentFragmentWrappingImplementation extends NodeWrappingImplementation
|
|||
_rawDocument.createDocumentFragment());
|
||||
}
|
||||
|
||||
Element queryOne(String selectors) {
|
||||
Element query(String selectors) {
|
||||
return LevelDom.wrapElement(_ptr.querySelector(selectors));
|
||||
}
|
||||
|
||||
ElementList query(String selectors) {
|
||||
ElementList queryAll(String selectors) {
|
||||
return LevelDom.wrapElementList(_ptr.querySelectorAll(selectors));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -188,9 +188,9 @@ interface Element extends Node /*, common.NodeSelector, common.ElementTraversal
|
|||
|
||||
void insertAdjacentText([String where, String text]);
|
||||
|
||||
Element queryOne(String selectors);
|
||||
Element query(String selectors);
|
||||
|
||||
ElementList query(String selectors);
|
||||
ElementList queryAll(String selectors);
|
||||
|
||||
void scrollByLines([int lines]);
|
||||
|
||||
|
|
|
@ -544,12 +544,12 @@ class ElementWrappingImplementation extends NodeWrappingImplementation implement
|
|||
_ptr.insertAdjacentText(where, text);
|
||||
}
|
||||
|
||||
Element queryOne(String selectors) {
|
||||
Element query(String selectors) {
|
||||
// TODO(jacobr): scope fix.
|
||||
return LevelDom.wrapElement(_ptr.querySelector(selectors));
|
||||
}
|
||||
|
||||
ElementList query(String selectors) {
|
||||
ElementList queryAll(String selectors) {
|
||||
// TODO(jacobr): scope fix.
|
||||
return new FrozenElementList._wrap(_ptr.querySelectorAll(selectors));
|
||||
}
|
||||
|
|
|
@ -60,7 +60,7 @@ void addGridStyles(String width, String height, [String margin = '']) {
|
|||
}
|
||||
|
||||
void _addColorStyles() {
|
||||
final grid = document.body.queryOne('#grid');
|
||||
final grid = document.body.query('#grid');
|
||||
final colors = const [ 'darkred', 'darkorange', 'darkgoldenrod',
|
||||
'darkgreen', 'darkblue', 'darkviolet'];
|
||||
int c = 0;
|
||||
|
@ -125,7 +125,7 @@ class MockView extends View {
|
|||
|
||||
|
||||
void printMetrics(String example) {
|
||||
final node = document.body.queryOne('#grid');
|
||||
final node = document.body.query('#grid');
|
||||
String exampleId = example.split(' ')[0];
|
||||
final sb = new StringBuffer();
|
||||
sb.add('void testSpecExample${exampleId}() {\n');
|
||||
|
|
|
@ -66,7 +66,7 @@ class GridLayoutTests extends UnitTestSuite {
|
|||
|
||||
for (String name in expected.getKeys()) {
|
||||
final values = expected[name];
|
||||
final node = document.body.queryOne('#$name');
|
||||
final node = document.body.query('#$name');
|
||||
Expect.isNotNull(node);
|
||||
Expect.equals(values[0], node.offsetLeft);
|
||||
Expect.equals(values[1], node.offsetTop);
|
||||
|
|
|
@ -51,7 +51,7 @@ class DartCombatTests extends UnitTestSuite {
|
|||
|
||||
void testParallelShoot() {
|
||||
// player 2 is configured to make parallel super shots towards player 1
|
||||
var p1OwnBoard = document.queryOne("#p1own");
|
||||
var p1OwnBoard = document.query("#p1own");
|
||||
|
||||
// add a boat of length 4 using mousedown/mousemove/mouseup
|
||||
var startCell = p1OwnBoard.nodes[0].nodes[4].nodes[2];
|
||||
|
@ -78,14 +78,14 @@ class DartCombatTests extends UnitTestSuite {
|
|||
_expectShotSequence(expectedShots, p1OwnBoard, 1);
|
||||
|
||||
// hit the boat from the enemy side.
|
||||
var p2EnemyBoard = document.queryOne("#p2enemy");
|
||||
var p2EnemyBoard = document.query("#p2enemy");
|
||||
var hitCell = p2EnemyBoard.nodes[0].nodes[4].nodes[3];
|
||||
doMouseEvent("click", hitCell);
|
||||
}
|
||||
|
||||
void testSerialShoot() {
|
||||
// player 1 is configured to make serial super shots towards player 2
|
||||
var p2OwnBoard = document.queryOne("#p2own");
|
||||
var p2OwnBoard = document.query("#p2own");
|
||||
|
||||
// add a boat of length 4 using mousedown/mousemove/mouseup
|
||||
var startCell = p2OwnBoard.nodes[0].nodes[3].nodes[8];
|
||||
|
@ -113,7 +113,7 @@ class DartCombatTests extends UnitTestSuite {
|
|||
_expectShotSequence(expectedShots, p2OwnBoard, 2);
|
||||
|
||||
// hit the boat from the enemy side.
|
||||
var p1EnemyBoard = document.queryOne("#p1enemy");
|
||||
var p1EnemyBoard = document.query("#p1enemy");
|
||||
var hitCell = p1EnemyBoard.nodes[0].nodes[4].nodes[8];
|
||||
doMouseEvent("click", hitCell);
|
||||
}
|
||||
|
|
|
@ -105,12 +105,12 @@ class SwarmTests extends UnitTestSuite {
|
|||
Expect.equals(getView(swarm.sections[0]), swarm.frontView.currentSection);
|
||||
|
||||
// Find the first slider menu item, and click on the one next after it.
|
||||
_click(document.query('.${CSS.SM_ITEM}')[1]);
|
||||
_click(document.queryAll('.${CSS.SM_ITEM}')[1]);
|
||||
|
||||
Expect.equals(getView(swarm.sections[1]), swarm.frontView.currentSection);
|
||||
|
||||
// Find the first menu item again and click on it.
|
||||
_click(document.queryOne('.${CSS.SM_ITEM}'));
|
||||
_click(document.query('.${CSS.SM_ITEM}'));
|
||||
|
||||
Expect.equals(getView(swarm.sections[0]), swarm.frontView.currentSection);
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ class EventUtil {
|
|||
* nothing. For most browsers this will cause the keyboard to be dismissed.
|
||||
*/
|
||||
static void blurFocusedElement() {
|
||||
Element focusedEl = document.queryOne("*:focus");
|
||||
Element focusedEl = document.query("*:focus");
|
||||
if (focusedEl != null) {
|
||||
focusedEl.blur();
|
||||
}
|
||||
|
|
|
@ -44,9 +44,9 @@ class PageNumberView extends View {
|
|||
<div class="page-number-right">›</div>
|
||||
</div>
|
||||
''');
|
||||
_left = node.queryOne('.page-number-left');
|
||||
_label = node.queryOne('.page-number-label');
|
||||
_right = node.queryOne('.page-number-right');
|
||||
_left = node.query('.page-number-left');
|
||||
_label = node.query('.page-number-label');
|
||||
_right = node.query('.page-number-right');
|
||||
return node;
|
||||
}
|
||||
|
||||
|
@ -101,7 +101,7 @@ class PagedColumnView extends View {
|
|||
<div class="paged-column">
|
||||
<div class="paged-column-container"></div>
|
||||
</div>''');
|
||||
_container = node.queryOne('.paged-column-container');
|
||||
_container = node.query('.paged-column-container');
|
||||
_container.nodes.add(contentView.node);
|
||||
|
||||
// TODO(jmesserly): if we end up with empty columns on the last page,
|
||||
|
@ -135,7 +135,7 @@ class PagedColumnView extends View {
|
|||
windowResized();
|
||||
|
||||
// Hook img onload events, so we find out about changes in content size
|
||||
for (ImageElement img in contentView.node.query("img")) {
|
||||
for (ImageElement img in contentView.node.queryAll("img")) {
|
||||
if (!img.complete) {
|
||||
img.on.load.add((e) {
|
||||
_updatePageCount();
|
||||
|
|
|
@ -58,7 +58,7 @@ class SliderMenu extends View {
|
|||
// Ideally, enterDocument should do nothing more than redecorate a view
|
||||
// and perhaps calculating the correct child sizes for edge cases that
|
||||
// cannot be handled by the browser layout engine.
|
||||
selectItem(node.queryOne('.sm-item'), false);
|
||||
selectItem(node.query('.sm-item'), false);
|
||||
|
||||
// TODO(mattsh), abstract this somehow into a touch click mixin
|
||||
if (Device.supportsTouch) {
|
||||
|
@ -116,7 +116,7 @@ class SliderMenu extends View {
|
|||
|
||||
void selectItemText(Element item) {
|
||||
// unselect all menu items
|
||||
for (final sliderItem in node.query('.sm-item')) {
|
||||
for (final sliderItem in node.queryAll('.sm-item')) {
|
||||
sliderItem.classes.remove('sel');
|
||||
}
|
||||
|
||||
|
@ -136,14 +136,14 @@ class SliderMenu extends View {
|
|||
}
|
||||
|
||||
void selectNext(bool animate) {
|
||||
final result = node.queryOne('.sm-item.sel').nextElementSibling;
|
||||
final result = node.query('.sm-item.sel').nextElementSibling;
|
||||
if (result != null) {
|
||||
selectItem(result, animate);
|
||||
}
|
||||
}
|
||||
|
||||
void selectPrevious(bool animate) {
|
||||
final result = node.queryOne('.sm-item.sel').previousElementSibling;
|
||||
final result = node.query('.sm-item.sel').previousElementSibling;
|
||||
if (result != null) {
|
||||
selectItem(result, animate);
|
||||
}
|
||||
|
@ -163,7 +163,7 @@ class SliderMenu extends View {
|
|||
// find the slider filler (the div element to the left of the
|
||||
// triangle) set its width the push the triangle to where we want it.
|
||||
String duration = animate ? '.3s' : '0s';
|
||||
final triangle = node.queryOne('.sm-triangle');
|
||||
final triangle = node.query('.sm-triangle');
|
||||
Css.setTransitionDuration(triangle.style, duration);
|
||||
FxUtil.setWebkitTransform(triangle, x, 0);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue