"Reverting 30388"

pkg/polymer/lib/src/declaration.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of polymer;
 
 /**
  * **Warning**: this class is experiental and subject to change.
  *
  * The implementation for the `polymer-element` element.
@@ skipping 347 matching lines @@
    * Takes external stylesheets loaded in an `<element>` element and moves
    * their content into a style element inside the `<element>`'s template.
    * The sheet is then removed from the `<element>`. This is done only so
    * that if the element is loaded in the main document, the sheet does
    * not become active.
    * Note, ignores sheets with the attribute 'polymer-scope'.
    */
   void installLocalSheets() {
     var sheets = this.sheets.where(
         (s) => !s.attributes.containsKey(_SCOPE_ATTR));
-    var content = this.templateContent;
+    var content = templateContent;
     if (content != null) {
       var cssText = new StringBuffer();
       for (var sheet in sheets) {
         cssText..write(_cssTextFromSheet(sheet))..write('\n');
       }
       if (cssText.length > 0) {
         content.insertBefore(
             new StyleElement()..text = '$cssText',
             content.firstChild);
       }
     }
   }
 
   List<Element> findNodes(String selector, [bool matcher(Element e)]) {
-    var nodes = this.queryAll(selector).toList();
-    var content = this.templateContent;
+    var nodes = this.querySelectorAll(selector).toList();
+    var content = templateContent;
     if (content != null) {
       nodes = nodes..addAll(content.queryAll(selector));
     }
     if (matcher != null) return nodes.where(matcher).toList();
     return nodes;
   }
 
   /**
    * Promotes external stylesheets and style elements with the attribute
    * polymer-scope='global' into global scope.
@@ skipping 152 matching lines @@
 bool _hasEventPrefix(String attr) => attr.startsWith(_EVENT_PREFIX);
 
 String _removeEventPrefix(String name) => name.substring(_EVENT_PREFIX.length);
 
 /**
  * Using Polymer's platform/src/ShadowCSS.js passing the style tag's content.
  */
 void _shimShadowDomStyling(DocumentFragment template, String name,
     String extendee) {
   if (js.context == null || template == null) return;
-  if (js.context.hasProperty('ShadowDOMPolyfill')) return;
+  if (!js.context.hasProperty('ShadowDOMPolyfill')) return;

[Siggi Cherem (dart-lang), 2013/11/21 01:46:13]

! o u c h

 
   var platform = js.context['Platform'];
   if (platform == null) return;
   var shadowCss = platform['ShadowCSS'];
   if (shadowCss == null) return;
   shadowCss.callMethod('shimStyling', [template, name, extendee]);
 }
 
 const _STYLE_SELECTOR = 'style';
 const _SHEET_SELECTOR = '[rel=stylesheet]';
 const _STYLE_GLOBAL_SCOPE = 'global';
 const _SCOPE_ATTR = 'polymer-scope';
 const _STYLE_SCOPE_ATTRIBUTE = 'element';
 const _STYLE_CONTROLLER_SCOPE = 'controller';
 
-String _cssTextFromSheet(Element sheet) {
-  if (sheet == null || js.context == null) return '';
-  var resource = new js.JsObject.fromBrowserObject(sheet)['__resource'];
-  return resource != null ? resource : '';
+String _cssTextFromSheet(LinkElement sheet) {
+  if (sheet == null) return '';
+
+  // TODO(jmesserly): sometimes the href property is wrong after deployment.
+  var href = sheet.href;
+  if (href == '') href = sheet.attributes["href"];
+
+  if (js.context != null && js.context.hasProperty('HTMLImports')) {
+    var jsSheet = new js.JsObject.fromBrowserObject(sheet);
+    var resource = jsSheet['__resource'];
+    if (resource != null) return resource;
+    _sheetLog.fine('failed to get stylesheet text href="$href"');
+    return '';
+  }
+  // TODO(jmesserly): it seems like polymer-js is always polyfilling
+  // HTMLImports, because their code depends on "__resource" to work.
+  // We work around this by using a sync XHR to get the stylesheet text.
+  // Right now this code is only used in Dartium, but if it's going to stick
+  // around we will need to find a different approach.
+  try {
+    return (new HttpRequest()
+        ..open('GET', href, async: false)
+        ..send())
+        .responseText;
+  } on DomException catch (e, t) {
+    _sheetLog.fine('failed to get stylesheet text href="$href" error: '
+        '$e, trace: $t');
+    return '';
+  }
 }
 
+final Logger _sheetLog = new Logger('polymer.stylesheet');
+
 const _OBSERVE_SUFFIX = 'Changed';
 
 // TODO(jmesserly): is this list complete?
 final _eventTranslations = const {
   // TODO(jmesserly): these three Polymer.js translations won't work in Dart,
   // because we strip the webkit prefix (below). Reconcile.
   'webkitanimationstart': 'webkitAnimationStart',
   'webkitanimationend': 'webkitAnimationEnd',
   'webkittransitionend': 'webkitTransitionEnd',
 
@@ skipping 22 matching lines @@
   return map;
 }();
 
 // Dart note: we need this function because we have additional renames JS does
 // not have. The JS renames are simply case differences, whereas we have ones
 // like doubleclick -> dblclick and stripping the webkit prefix.
 String _eventNameFromType(String eventType) {
   final result = _reverseEventTranslations[eventType];
   return result != null ? result : eventType;
 }