Merge branch 'master' of github.com:Polymer/designer

Polymer · Apr 5, 2014 · 90099b5 · 90099b5
2 parents 98cf4ca + 8bfafdc
commit 90099b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/elements/x-dom-serializer/x-dom-serializer.html b/elements/x-dom-serializer/x-dom-serializer.html
@@ -252,12 +252,15 @@
       dumpImports: function(element, indent) {
         var n$ = element.querySelectorAll('*');
         var imports = [], metas=[];
-        for (var i=0, l=n$.length, n, m; (i<l) && (n=n$[i]); i++) {
+        for (var i=0, l=n$.length, n, m, p; (i<l) && (n=n$[i]); i++) {
           m = n.meta;
           if (m && metas.indexOf(m) < 0) {
             metas.push(m);
-            var f = m.getImports().content.cloneNode(true);
-            imports = imports.concat(f.querySelectorAll('link[rel=import]').array());
+            p = m.getImports();
+            if (p) {
+              p = p.content.cloneNode(true);
+              imports = imports.concat(p.querySelectorAll('link[rel=import]').array());
+            }
           }
         }
         var href = window.location.origin + window.location.pathname;

diff --git a/elements/x-meta/x-meta.html b/elements/x-meta/x-meta.html
@@ -128,7 +128,9 @@
       getImports: function() {
         var t = this.querySelector('#imports');
         // resolve urls in template.
-        Platform.urlResolver.resolveTemplate(t);
+        if (t) {
+          Platform.urlResolver.resolveTemplate(t);
+        }
         return t;
       },
       loadImports: function(callback) {