Using dart:convert HtmlEscape; got rid of query()

Author: shailen

html5/lib/htmlescape.dart

@@ -18,7 +18,7 @@ List<String> getDartPaths(htmlPaths) {
   for (var htmlPath in htmlPaths) {
     var file = new File(htmlPath).readAsStringSync();
     var contents = parse(file);
-    var scripts = contents.body.queryAll("script");
+    var scripts = contents.body.querySelectorAll("script");
     if (!scripts.isEmpty) {
       for(var script in scripts) {
         if (script.attributes['type'] == 'application/dart') {

html5/tool/hop_runner.dart

@@ -42,7 +42,7 @@ void drawImage(CanvasElement canvas, ImageElement image,
 }
 
 void main() {
-  CanvasElement canvas = query("#canvas");
-  ImageElement pic = query("#pic");
+  CanvasElement canvas = querySelector("#canvas");
+  ImageElement pic = querySelector("#pic");
   drawImage(canvas, pic, desX: 10, desY: 10, desW: 300, desH: 90);
-}
+}

html5/web/canvas/hidpi/hidpi.dart

@@ -12,7 +12,7 @@ class Basics {
   Element _dragSourceEl;
 
   void start() {
-    var cols = document.queryAll('#columns .column');
+    var cols = document.querySelectorAll('#columns .column');
     for (var col in cols) {
       col.onDragStart.listen(_onDragStart);
       col.onDragEnd.listen(_onDragEnd);
@@ -34,7 +34,7 @@ class Basics {
   void _onDragEnd(MouseEvent event) {
     Element dragTarget = event.target;
     dragTarget.classes.remove('moving');
-    var cols = document.queryAll('#columns .column');
+    var cols = document.querySelectorAll('#columns .column');
     for (var col in cols) {
       col.classes.remove('over');
     }

html5/web/dnd/basics/basics.dart

@@ -5,22 +5,24 @@
 // This is a port of "Reading Files in JavaScript Using the File APIs" to Dart.
 // See: http://www.html5rocks.com/en/tutorials/file/dndfiles/
 
+import 'dart:convert' show HtmlEscape;
 import 'dart:html';
-import 'package:dart_samples/htmlescape.dart';
+
 
 class DndFiles {
   FormElement _readForm;
   InputElement _fileInput;
   Element _dropZone;
   OutputElement _output;
+  HtmlEscape sanitizer = new HtmlEscape();
 
   DndFiles() {
-    _output = document.query('#list');
-    _readForm = document.query('#read');
-    _fileInput = document.query('#files');
+    _output = document.querySelector('#list');
+    _readForm = document.querySelector('#read');
+    _fileInput = document.querySelector('#files');
     _fileInput.onChange.listen((e) => _onFileInputChange());
 
-    _dropZone = document.query('#drop-zone');
+    _dropZone = document.querySelector('#drop-zone');
     _dropZone.onDragOver.listen(_onDragOver);
     _dropZone.onDragEnter.listen((e) => _dropZone.classes.add('hover'));
     _dropZone.onDragLeave.listen((e) => _dropZone.classes.remove('hover'));
@@ -58,7 +60,7 @@ class DndFiles {
         reader.onLoad.listen((e) {
           var thumbnail = new ImageElement(src: reader.result);
           thumbnail.classes.add('thumb');
-          thumbnail.title = htmlEscape(file.name);
+          thumbnail.title = sanitizer.convert(file.name);
           thumbHolder.nodes.add(thumbnail);
         });
         reader.readAsDataUrl(file);
@@ -68,9 +70,9 @@ class DndFiles {
       // For all file types, display some properties.
       var properties = new Element.tag('span');
       properties.innerHtml = (new StringBuffer('<strong>')
-          ..write(htmlEscape(file.name))
+          ..write(sanitizer.convert(file.name))
           ..write('</strong> (')
-          ..write(file.type != null ? htmlEscape(file.type) : 'n/a')
+          ..write(file.type != null ? sanitizer.convert(file.type) : 'n/a')
           ..write(') ')
           ..write(file.size)
           ..write(' bytes')

html5/web/file/dndfiles/dndfiles.dart

@@ -15,10 +15,10 @@ class Monitoring {
   FileReader _reader;
 
   Monitoring() {
-    _progressBar = query('#progress-bar');
-    _fileInput = document.query('#files');
+    _progressBar = querySelector('#progress-bar');
+    _fileInput = document.querySelector('#files');
     _fileInput.onChange.listen((e) => _onFilesSelected());
-    var cancelButton = query('#cancel-read');
+    var cancelButton = querySelector('#cancel-read');
     cancelButton.onClick.listen((e) => _onCancel());
   }
 
@@ -79,4 +79,4 @@ class Monitoring {
 
 void main() {
   new Monitoring();
-}
+}

html5/web/file/dndfiles/monitoring.dart

@@ -13,16 +13,16 @@ class Slicing {
   Element _byteRange;
 
   Slicing() {
-    _content = query('#byte-content');
-    _byteRange = query('#byte-range');
+    _content = querySelector('#byte-content');
+    _byteRange = querySelector('#byte-range');
 
-    _fileInput = query('#files');
+    _fileInput = querySelector('#files');
     _fileInput.onChange.listen((e) {
       _content.text = '';
       _byteRange.text = '';
     });
 
-    var buttons = query('#read-bytes-buttons');
+    var buttons = querySelector('#read-bytes-buttons');
     buttons.onClick.listen(_onClick);
   }
 

html5/web/file/dndfiles/slicing.dart

@@ -5,25 +5,26 @@
 // This is a port of "Exploring the FileSystem APIs" to Dart.
 // See: http://www.html5rocks.com/en/tutorials/file/filesystem/
 
+import 'dart:convert' show HtmlEscape;
 import 'dart:html';
-import 'package:dart_samples/htmlescape.dart';
 
 class FileSystemExample {
   FileSystem _filesystem;
   Element _fileList;
+  HtmlEscape sanitizer = new HtmlEscape();
 
   FileSystemExample() {
-    _fileList = query('#example-list-fs-ul');
+    _fileList = querySelector('#example-list-fs-ul');
 
     window.requestFileSystem(1024 * 1024, persistent: false)
     .then(_requestFileSystemCallback, onError: _handleError);
   }
 
   void _requestFileSystemCallback(FileSystem filesystem) {
     _filesystem = filesystem;
-    query('#add-button').onClick.listen((e) => _addFiles());
-    query('#list-button').onClick.listen((e) => _listFiles());
-    query('#remove-button').onClick.listen((e) => _removeFiles());
+    querySelector('#add-button').onClick.listen((e) => _addFiles());
+    querySelector('#list-button').onClick.listen((e) => _listFiles());
+    querySelector('#remove-button').onClick.listen((e) => _removeFiles());
   }
 
   void _handleError(FileError e) {
@@ -48,7 +49,7 @@ class FileSystemExample {
         msg = 'Unknown Error';
         break;
     }
-    query("#example-list-fs-ul").text = "Error: $msg";
+    querySelector("#example-list-fs-ul").text = "Error: $msg";
   }
 
   void _addFiles() {
@@ -72,7 +73,8 @@ class FileSystemExample {
         var img = entry.isDirectory ? '<img src="http://www.html5rocks.com/static/images/tutorials/icon-folder.gif">' :
                                       '<img src="http://www.html5rocks.com/static/images/tutorials/icon-file.gif">';
         var li = new Element.tag("li");
-        li.innerHtml = "$img<span>${htmlEscape(entry.name)}</span>";
+
+        li.innerHtml = "$img<span>${sanitizer.convert(entry.name)}</span>";
         fragment.nodes.add(li);
       });
       _fileList.nodes.add(fragment);
@@ -96,4 +98,4 @@ class FileSystemExample {
 
 void main() {
   new FileSystemExample();
-}
+}