Remove deprecated escapeHtml function
diff --git a/pkgs/markdown/CHANGELOG.md b/pkgs/markdown/CHANGELOG.md index 469c685..b9d162d 100644 --- a/pkgs/markdown/CHANGELOG.md +++ b/pkgs/markdown/CHANGELOG.md
@@ -1,3 +1,7 @@ +## 1.0.0 + +* Remove deprecated `escapeHtml` function. + ## 0.11.4 * Fix bug with lazy blockquote continuations (#162)
diff --git a/pkgs/markdown/lib/markdown.dart b/pkgs/markdown/lib/markdown.dart index f4faacf..8b477d4 100644 --- a/pkgs/markdown/lib/markdown.dart +++ b/pkgs/markdown/lib/markdown.dart
@@ -11,5 +11,4 @@ export 'src/extension_set.dart'; export 'src/html_renderer.dart'; export 'src/inline_parser.dart'; -export 'src/util.dart' show escapeHtml; export 'src/version.dart';
diff --git a/pkgs/markdown/lib/src/block_parser.dart b/pkgs/markdown/lib/src/block_parser.dart index b8d4e3c..20e05ba 100644 --- a/pkgs/markdown/lib/src/block_parser.dart +++ b/pkgs/markdown/lib/src/block_parser.dart
@@ -396,7 +396,7 @@ childLines.add(''); // Escape the code. - var escaped = escapeHtmlImpl(childLines.join('\n')); + var escaped = escapeHtml(childLines.join('\n')); return new Element('pre', [new Element.text('code', escaped)]); } @@ -442,7 +442,7 @@ childLines.add(''); // Escape the code. - var escaped = escapeHtmlImpl(childLines.join('\n')); + var escaped = escapeHtml(childLines.join('\n')); var code = new Element.text('code', escaped);
diff --git a/pkgs/markdown/lib/src/inline_parser.dart b/pkgs/markdown/lib/src/inline_parser.dart index 2f4e243..8b82a50 100644 --- a/pkgs/markdown/lib/src/inline_parser.dart +++ b/pkgs/markdown/lib/src/inline_parser.dart
@@ -250,7 +250,7 @@ bool onMatch(InlineParser parser, Match match) { var url = match[1]; - var anchor = new Element.text('a', escapeHtmlImpl(url)); + var anchor = new Element.text('a', escapeHtml(url)); anchor.attributes['href'] = url; parser.addNode(anchor); @@ -339,9 +339,9 @@ var element = new Element('a', state.children); - element.attributes["href"] = escapeHtmlImpl(link.url); + element.attributes["href"] = escapeHtml(link.url); if (link.title != null) { - element.attributes['title'] = escapeHtmlImpl(link.title); + element.attributes['title'] = escapeHtml(link.title); } return element; @@ -408,11 +408,11 @@ var link = getLink(parser, match, state); if (link == null) return null; var image = new Element.empty("img"); - image.attributes["src"] = escapeHtmlImpl(link.url); + image.attributes["src"] = escapeHtml(link.url); image.attributes["alt"] = state?.textContent ?? ''; if (link.title != null) { - image.attributes["title"] = escapeHtmlImpl(link.title); + image.attributes["title"] = escapeHtml(link.title); } return image; @@ -455,7 +455,7 @@ } bool onMatch(InlineParser parser, Match match) { - parser.addNode(new Element.text('code', escapeHtmlImpl(match[2].trim()))); + parser.addNode(new Element.text('code', escapeHtml(match[2].trim()))); return true; } }
diff --git a/pkgs/markdown/lib/src/util.dart b/pkgs/markdown/lib/src/util.dart index 9ff8262..f670389 100644 --- a/pkgs/markdown/lib/src/util.dart +++ b/pkgs/markdown/lib/src/util.dart
@@ -1,9 +1,4 @@ import 'dart:convert'; -/// Replaces `<`, `&`, and `>`, with their HTML entity equivalents. -@Deprecated('Use `const HtmlEscape(HtmlEscapeMode.ELEMENT).convert` from ' - '`dart:convert` instead.') -String escapeHtml(String html) => escapeHtmlImpl(html); - -String escapeHtmlImpl(String html) => +String escapeHtml(String html) => const HtmlEscape(HtmlEscapeMode.ELEMENT).convert(html);
diff --git a/pkgs/markdown/pubspec.yaml b/pkgs/markdown/pubspec.yaml index 8544f4d..17ec8e4 100644 --- a/pkgs/markdown/pubspec.yaml +++ b/pkgs/markdown/pubspec.yaml
@@ -1,5 +1,5 @@ name: markdown -version: 0.11.5-dev +version: 1.0.0-dev author: Dart Team <misc@dartlang.org> description: A library for converting markdown to HTML. homepage: https://github.com/dart-lang/markdown