languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-15 21:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed element upgrading for polymer

Browse source 
TBR=alanknight@google.com

Review URL: https://codereview.chromium.org/1382383003 .
This commit is contained in:
Terry L. Lucas 2015-10-06 13:11:23 -07:00
parent df52deea9f
commit f867fb0218
3 changed files with 48 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sdk/lib/html/dartium/html_dartium.dart
View file

@ -1106,6 +1106,9 @@ Function _getSvgFunction(String key) {
********** **********
******************************************************************************/
// List of known tagName to DartClass for custom elements, used for upgrade.
var _knownCustomeElements = new Map<String, Type>();
Rectangle make_dart_rectangle(r) =>
r == null ? null : new Rectangle(r['left'], r['top'], r['width'], r['height']);
@ -1175,11 +1178,24 @@ wrap_jso(jsObject) {
// Got a dart_class (it's a custom element) use it it's already set up.
dartClass_instance = jsObject['dart_class'];
} else {
var func = getHtmlCreateFunction(jsTypeName);
if (func != null) {
dartClass_instance = func();
dartClass_instance.blink_jsObject = jsObject;
js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
var localName = jsObject['localName'];
var customElementClass = _knownCustomeElements[localName];
// Custom Element to upgrade.
if (jsTypeName == 'HTMLElement' && customElementClass != null) {
try {
dartClass_instance = _blink.Blink_Utils.constructElement(customElementClass, jsObject);
} finally {
dartClass_instance.blink_jsObject = jsObject;
jsObject['dart_class'] = dartClass_instance;
js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
}
} else {
var func = getHtmlCreateFunction(jsTypeName);
if (func != null) {
dartClass_instance = func();
dartClass_instance.blink_jsObject = jsObject;
js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
}
}
}
return dartClass_instance;
@ -20365,6 +20381,9 @@ class HtmlDocument extends Document {
}
var elemProto = js.context['Object'].callMethod("create", [baseElement['prototype']]);
// Remember for any upgrading done in wrap_jso.
_knownCustomeElements[tag] = customElementClass;
// TODO(terry): Hack to stop recursion re-creating custom element when the
// created() constructor of the custom element does e.g.,
//

26
tools/dom/templates/html/dartium/html_dartium.darttemplate
View file

@ -351,6 +351,9 @@ Function _getSvgFunction(String key) {
********** **********
******************************************************************************/
// List of known tagName to DartClass for custom elements, used for upgrade.
var _knownCustomeElements = new Map<String, Type>();
Rectangle make_dart_rectangle(r) =>
r == null ? null : new Rectangle(r['left'], r['top'], r['width'], r['height']);
@ -420,11 +423,24 @@ wrap_jso(jsObject) {
// Got a dart_class (it's a custom element) use it it's already set up.
dartClass_instance = jsObject['dart_class'];
} else {
var func = getHtmlCreateFunction(jsTypeName);
if (func != null) {
dartClass_instance = func();
dartClass_instance.blink_jsObject = jsObject;
js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
var localName = jsObject['localName'];
var customElementClass = _knownCustomeElements[localName];
// Custom Element to upgrade.
if (jsTypeName == 'HTMLElement' && customElementClass != null) {
try {
dartClass_instance = _blink.Blink_Utils.constructElement(customElementClass, jsObject);
} finally {
dartClass_instance.blink_jsObject = jsObject;
jsObject['dart_class'] = dartClass_instance;
js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
}
} else {
var func = getHtmlCreateFunction(jsTypeName);
if (func != null) {
dartClass_instance = func();
dartClass_instance.blink_jsObject = jsObject;
js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
}
}
}
return dartClass_instance;

3
tools/dom/templates/html/impl/impl_HTMLDocument.darttemplate
View file

@ -377,6 +377,9 @@ $else
}
var elemProto = js.context['Object'].callMethod("create", [baseElement['prototype']]);
// Remember for any upgrading done in wrap_jso.
_knownCustomeElements[tag] = customElementClass;
// TODO(terry): Hack to stop recursion re-creating custom element when the
// created() constructor of the custom element does e.g.,
//