Merge pull request #5123 from duykhoa/maintenace/refactor-style-gather

Simplify condition checking in stylesFromModule function
Polymer · Feb 19, 2018 · 10aded4 · 10aded4
2 parents 5c02730 + e690382
commit 10aded4
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/utils/style-gather.html b/lib/utils/style-gather.html
@@ -80,7 +80,13 @@
      */
     stylesFromModule(moduleId) {
       const m = importModule(moduleId);
-      if (m && m._styles === undefined) {
+
+      if (!m) {
+        console.warn('Could not find style data in module named', moduleId);
+        return [];
+      }
+
+      if (m._styles === undefined) {
         const styles = [];
         // module imports: <link rel="import" type="css">
         styles.push(...this._stylesFromModuleImports(m));
@@ -90,12 +96,11 @@
           styles.push(...this.stylesFromTemplate(template,
             /** @type {templateWithAssetPath} */(m).assetpath));
         }
+
         m._styles = styles;
       }
-      if (!m) {
-        console.warn('Could not find style data in module named', moduleId);
-      }
-      return m ? m._styles : [];
+
+      return m._styles;
     },
 
     /**