Fix settings to pull from Polymer object for defaults.

Polymer · Nov 15, 2018 · 77f3436 · 77f3436
1 parent e809515
commit 77f3436
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/lib/utils/settings.html b/lib/utils/settings.html
@@ -42,10 +42,8 @@
    *
    * @memberof Polymer
    */
-  let rootPath = Polymer.rootPath ||
-    Polymer.ResolveUrl.pathFromUrl(document.baseURI || window.location.href);
-
-  Polymer.rootPath = rootPath;
+  Polymer.rootPath = Polymer.rootPath ||
+    Polymer.ResolveUrl.pathFromUrl(document.baseURI || window.location.href);;
 
   /**
    * Sets the global rootPath property used by `Polymer.ElementMixin` and
@@ -76,10 +74,7 @@
    * @type {(function(*,string,string,Node):*)|undefined}
    * @memberof Polymer
    */
-  let sanitizeDOMValue = Polymer.sanitizeDOMValue;
-
-  // This is needed for tooling
-  Polymer.sanitizeDOMValue = sanitizeDOMValue;
+  Polymer.sanitizeDOMValue = Polymer.sanitizeDOMValue || null;
 
   /**
    * Sets the global sanitizeDOMValue available via `Polymer.sanitizeDOMValue`.
@@ -100,9 +95,7 @@
    *
    * @memberof Polymer
    */
-  let passiveTouchGestures = false;
-
-  Polymer.passiveTouchGestures = passiveTouchGestures;
+  Polymer.passiveTouchGestures = Polymer.passiveTouchGestures || false;
 
   /**
    * Sets `passiveTouchGestures` globally for all elements using Polymer Gestures.
@@ -115,8 +108,9 @@
     Polymer.passiveTouchGestures = usePassive;
   };
 
-  let legacyOptimizations = false;
-  Polymer.legacyOptimizations = legacyOptimizations;
+  Polymer.legacyOptimizations = Polymer.legacyOptimizations || 
+      window.PolymerSettings && PolymerSettings.legacyOptimizations || false;
+
   /**
    * Sets `legacyOptimizations` globally for all elements. Enables
    * optimizations when only legacy Polymer() style elements are used.