Merge pull request #5323 from bmac/vendor-prefix

Stop using deprecated vendor-prefix hook to inject enableoptionalfeat…
emberjs · Jan 15, 2018 · 90624a3 · 90624a3
2 parents 0d99f76 + 2575b4a
commit 90624a3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/lib/enable-optional-features-via-url/index.js b/lib/enable-optional-features-via-url/index.js
@@ -12,13 +12,22 @@ module.exports = {
     the flag to true when there is a `enableoptionalfeatures` query parameter.
    */
   contentFor: function(name) {
-    if (name === "vendor-prefix") {
+    if (name === "enable-optional-features") {
       var array = [
+        "<script>",
         "// injected by lib/enable-optional-features-via-url",
-        "window.EmberENV = window.EmberENV || {};",
-        "if (typeof window.EmberENV.ENABLE_OPTIONAL_FEATURES === 'undefined') {",
-        "  window.EmberENV.ENABLE_OPTIONAL_FEATURES = window.location.search.indexOf('enableoptionalfeatures') !== -1;",
-        "}"
+        "Object.defineProperty(window, 'EmberENV', {",
+        "  get() {",
+        "    if (typeof this._EmberENV.ENABLE_OPTIONAL_FEATURES === 'undefined') {",
+        "      this._EmberENV.ENABLE_OPTIONAL_FEATURES = window.location.search.indexOf('enableoptionalfeatures') !== -1;",
+        "    }",
+        "    return this._EmberENV;",
+        "  },",
+        "  set(value) {",
+        "    this._EmberENV = value;",
+        "  }",
+        "});",
+        "</script>",
       ];
 
       return array.join('\n');

diff --git a/tests/index.html b/tests/index.html
@@ -20,6 +20,7 @@
   <body>
     {{content-for "body"}}
     {{content-for "test-body"}}
+    {{content-for "enable-optional-features"}}
 
     <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>