Merge remote-tracking branch 'fj/master' into master

js/gated-content/.browserslistrc

@@ -1,3 +1,4 @@
+IE 11
 > 1%
 last 2 versions
 not dead

js/gated-content/.postcssrc

@@ -0,0 +1,5 @@
+{
+  "plugins": {
+    "autoprefixer": {"grid": "autoplace"}
+  }
+}

js/gated-content/babel.config.js

@@ -1,5 +1,13 @@
 module.exports = {
   presets: [
-    '@vue/cli-plugin-babel/preset',
+    [
+      '@vue/cli-plugin-babel/preset', {
+        useBuiltIns: 'entry',
+        corejs: {
+          version: 3,
+          proposals: true,
+        },
+      },
+    ],
   ],
 };

js/gated-content/package.json

@@ -10,17 +10,22 @@
     "dev": "vue-cli-service build --target lib --formats umd-min --name gated-content src/main.js --watch"
   },
   "dependencies": {
+    "@vue/babel-preset-app": "^3.12.1",
     "axios": "^0.19.2",
+    "babel-polyfill": "^6.26.0",
     "bootstrap": "^4.4.1",
     "calendar-link": "^1.3.0",
-    "core-js": "^3.6.4",
+    "core-js": "^3.7.0",
     "qs": "^6.9.4",
+    "regenerator-runtime": "^0.13.7",
     "vue": "^2.6.11",
     "vue-router": "^3.1.6",
     "vue-video-wrapper": "^1.0.10",
     "vuex": "^3.1.3"
   },
   "devDependencies": {
+    "@babel/core": "^7.6.2",
+    "@babel/preset-env": "^7.6.2",
     "@vue/cli-plugin-babel": "~4.3.0",
     "@vue/cli-plugin-eslint": "~4.3.0",
     "@vue/cli-plugin-router": "~4.3.0",

js/gated-content/src/main.js

@@ -4,6 +4,8 @@ import router from './router';
 import store from './store';
 import filters from './filters';
 import Log from './plugins/log';
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
 
 Vue.use(Log);
 
@@ -19,4 +21,19 @@ new Vue({
   components: {
     App,
   },
+  mounted() {
+    const app = this;
+
+    if ('-ms-scroll-limit' in document.documentElement.style
+      && '-ms-ime-align' in document.documentElement.style) {
+      window.addEventListener('hashchange',
+        () => {
+          const currentPath = window.location.hash.slice(1);
+          if (app.$route.path !== currentPath) {
+            app.$router.replace(currentPath);
+          }
+        },
+        false);
+    }
+  },
 }).$mount('#gated-content');

js/gated-content/src/scss/components/_blog-listing.scss

@@ -1,19 +1,32 @@
 .blog-listing {
-  padding-top: 30px;
   display: grid;
-  grid-gap: 30px;
+  grid-column-gap: 30px;
   grid-template-columns: 1fr;
+  grid-template-rows: repeat(10, auto);
+
+  > * {
+    margin-top: 30px;
+  }
 
   @media all and (max-width: 600px) {
-    grid-gap: 10px;
-    padding-top: 10px;
+    grid-column-gap: 10px;
+    grid-template-columns: 1fr;
+    grid-template-rows: repeat(10, auto);
+
+    > * {
+      margin-top: 10px;
+    }
   }
 
   @media all and (min-width: 600px) {
+    grid-column-gap: 30px;
     grid-template-columns: repeat(2, 1fr);
+    grid-template-rows: repeat(10, auto);
   }
 
   @media all and (min-width: 1200px) {
+    grid-column-gap: 30px;
     grid-template-columns: repeat(3, 1fr);
+    grid-template-rows: repeat(10, auto);
   }
 }

js/gated-content/src/scss/components/_category-listing.scss

@@ -1,19 +1,31 @@
 .category-listing {
-  padding-top: 30px;
   display: grid;
-  grid-gap: 30px;
-  grid-template-columns: 1fr;
+  grid-column-gap: 30px;
+  grid-template-rows: repeat(10, auto);
+
+  > * {
+    margin-top: 30px;
+  }
 
   @media all and (max-width: 600px) {
-    grid-gap: 10px;
-    padding-top: 10px;
+    grid-column-gap: 10px;
+    grid-template-columns: 1fr;
+    grid-template-rows: repeat(10, auto);
+
+    > * {
+      margin-top: 10px;
+    }
   }
 
   @media all and (min-width: 600px) {
+    grid-column-gap: 30px;
     grid-template-columns: repeat(2, 1fr);
+    grid-template-rows: repeat(10, auto);
   }
 
   @media all and (min-width: 1200px) {
+    grid-column-gap: 30px;
     grid-template-columns: repeat(3, 1fr);
+    grid-template-rows: repeat(10, auto);
   }
 }

js/gated-content/src/scss/components/_video-listing.scss

@@ -71,17 +71,25 @@
   }
 
   .video-listing {
-    padding-top: 30px;
     display: grid;
-    grid-gap: 30px;
+    grid-column-gap: 30px;
     grid-template-columns: 1fr;
+    grid-template-rows: repeat(10, auto);
+
+    > * {
+      margin-top: 30px;
+    }
 
     @media all and (min-width: 600px) {
+      grid-column-gap: 30px;
       grid-template-columns: repeat(2, 1fr);
+      grid-template-rows: repeat(10, auto);
     }
 
     @media all and (min-width: 1200px) {
+      grid-column-gap: 30px;
       grid-template-columns: repeat(3, 1fr);
+      grid-template-rows: repeat(10, auto);
     }
   }
 

js/gated-content/src/scss/views/_video-page.scss

@@ -37,10 +37,12 @@
     display: grid;
     grid-gap: 10px;
     grid-template-columns: 1fr;
+    grid-template-rows: auto;
     color: $gallery;
 
     @media all and (min-width: 600px) {
       grid-template-columns: 3fr 1.2fr;
+      grid-template-rows: auto;
       grid-gap: 30px;
     }
 

js/gated-content/vue.config.js

@@ -16,4 +16,7 @@ module.exports = {
       patterns: [path.resolve(__dirname, './src/scss/global.scss')],
     },
   },
+  transpileDependencies: [
+    /\w+/,
+  ],
 };

modules/openy_gc_log/js/logger.behaviors.js

@@ -1,7 +1,11 @@
 (function ($, Drupal) {
  Drupal.behaviors.openy_gc_log_subscribe = {
    attach: function (context) {
-     document.body.addEventListener('virtual-y-log', (event) => {
+     // Only run this script on full documents, not ajax requests.
+     if (context !== document) {
+       return;
+     }
+     document.body.addEventListener('virtual-y-log', function (event) {
        $.ajax({
          url: "/virtual-y/log",
          method: "POST",