@mjhls/mjh-framework 1.0.481 → 1.0.483

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.481
+# mjh-framework v. 1.0.482
 
 
 > Foundation Framework 

package/dist/cjs/AD728x90.js

@@ -30,8 +30,7 @@ var AD728x90 = function AD728x90(_ref) {
       targeting = _ref$targeting === undefined ? {} : _ref$targeting,
       _ref$pos = _ref.pos,
       pos = _ref$pos === undefined ? 'top' : _ref$pos,
-      _ref$fixedPos = _ref.fixedPos,
-      fixedPos = _ref$fixedPos === undefined ? '60px' : _ref$fixedPos;
+      _ref$fixedPos = _ref.fixedPos;
 
   var mobileView = false;
   if (main.main_39) {
@@ -65,7 +64,7 @@ var AD728x90 = function AD728x90(_ref) {
     if (stickyAd && window.pageYOffset + (AdOffsetTop - navbar.offsetHeight) > AdOffsetTop) {
       if (adRef.current && adRef.current.style) {
         adRef.current.style.position = 'fixed';
-        adRef.current.style.top = fixedPos;
+        adRef.current.style.bottom = '0';
         adRef.current.style.left = '0px';
         adRef.current.style.zIndex = '9999';
         adRef.current.style.width = '100%';
@@ -92,27 +91,32 @@ var AD728x90 = function AD728x90(_ref) {
 
   return React__default.createElement(
     'div',
-    { className: 'leaderboard-ad-wrapper', ref: adRef, style: { backgroundColor: '#fff' } },
-    React__default.createElement(AdSlot, {
-      setStickyAd: setStickyAd,
-      slotId: slotId,
-      networkID: networkID,
-      adUnit: adUnit,
-      targeting: adTargeting,
-      className: 'AD728x90',
-      sizes: mobileView ? mobileSizes : browserSizes,
-      sizeMapping: [{
-        viewport: [768, 1],
-        sizes: [[728, 90], [970, 90]]
-      }, {
-        viewport: [1, 1],
-        sizes: [[320, 50], [300, 50]]
-      }]
-    }),
+    { className: 'leaderboard-ad-wrapper', style: { backgroundColor: '#fff' } },
+    React__default.createElement(
+      'div',
+      { ref: adRef, style: { height: 'auto', background: '#fff' } },
+      React__default.createElement(AdSlot, {
+
+        setStickyAd: setStickyAd,
+        slotId: slotId,
+        networkID: networkID,
+        adUnit: adUnit,
+        targeting: adTargeting,
+        className: 'AD728x90',
+        sizes: mobileView ? mobileSizes : browserSizes,
+        sizeMapping: [{
+          viewport: [768, 1],
+          sizes: [[728, 90], [970, 90]]
+        }, {
+          viewport: [1, 1],
+          sizes: [[320, 50], [300, 50]]
+        }]
+      })
+    ),
     React__default.createElement(
       'style',
       { jsx: 'true' },
-      '\n        .leaderboard-ad-wrapper {\n          min-height: 90px;\n        }\n        @media screen and (max-width: 768px) {\n          .leaderboard-ad-wrapper {\n            min-height: 50px;\n          }\n        }\n      '
+      '\n        .leaderboard-ad-wrapper {\n          min-height: 90px;\n        }\n        @media screen and (max-width: 768px) {\n          .leaderboard-ad-wrapper {\n            min-height: calc(50px + 1rem);\n          }\n        }\n      '
     )
   );
 };

package/dist/cjs/AdSlot.js

@@ -70,6 +70,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
     'div',
     { className: className, style: { textAlign: 'center' } },
     React__default.createElement(index.lib_2, {
+      style: { marginBottom: '1rem' },
       slotId: slotId,
       sizes: sizes,
       adUnit: adUnit,

package/dist/cjs/DeckContent.js

@@ -42,7 +42,7 @@ require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 require('./beam-9ffe0364.js');
 require('./AdSlot.js');
-var ADInfeed = require('./ADInfeed-9984cb73.js');
+var ADInfeed = require('./ADInfeed-9df26f11.js');
 
 var DeckContent = function (_React$Component) {
   inherits._inherits(DeckContent, _React$Component);

package/dist/cjs/EventsDeck.js

@@ -1672,6 +1672,9 @@ var EventsDeck = function EventsDeck(_ref) {
           }
           return 0;
         });
+        if (filter.indexOf('end') >= 0) {
+          sortedEventsByStartData.reverse();
+        }
         setData(function (prevData) {
           return [].concat(toConsumableArray._toConsumableArray(prevData), toConsumableArray._toConsumableArray(sortedEventsByStartData));
         });

package/dist/cjs/GridContent.js

@@ -42,9 +42,9 @@ require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 require('./beam-9ffe0364.js');
 require('./AdSlot.js');
-var ADInfeed = require('./ADInfeed-9984cb73.js');
+var ADInfeed = require('./ADInfeed-9df26f11.js');
 var lodash = require('./lodash-fc2922d0.js');
-var ADlgInfeed = require('./ADlgInfeed-bd434369.js');
+var ADlgInfeed = require('./ADlgInfeed-732fb987.js');
 require('./_arrayMap-3b4a0f75.js');
 var get = require('./get-5dfcdc33.js');
 require('./AD.js');

package/dist/cjs/IssueLanding.js

@@ -34,9 +34,9 @@ require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 require('./beam-9ffe0364.js');
 require('./AdSlot.js');
-require('./ADInfeed-9984cb73.js');
+require('./ADInfeed-9df26f11.js');
 require('./lodash-fc2922d0.js');
-require('./ADlgInfeed-bd434369.js');
+require('./ADlgInfeed-732fb987.js');
 require('./AuthorComponent-cb8b8128.js');
 require('react-bootstrap');
 var QueueDeckExpanded = require('./QueueDeckExpanded.js');

package/dist/cjs/MasterDeck.js

@@ -40,9 +40,9 @@ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 require('./beam-9ffe0364.js');
 require('./AdSlot.js');
-var ADInfeed = require('./ADInfeed-9984cb73.js');
+var ADInfeed = require('./ADInfeed-9df26f11.js');
 var lodash = require('./lodash-fc2922d0.js');
-var ADlgInfeed = require('./ADlgInfeed-bd434369.js');
+var ADlgInfeed = require('./ADlgInfeed-732fb987.js');
 
 var MasterDeck = function (_React$Component) {
   inherits._inherits(MasterDeck, _React$Component);

package/dist/cjs/PartnerDetailListing.js

@@ -36,9 +36,9 @@ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 require('./beam-9ffe0364.js');
 require('./AdSlot.js');
-require('./ADInfeed-9984cb73.js');
+require('./ADInfeed-9df26f11.js');
 require('./lodash-fc2922d0.js');
-require('./ADlgInfeed-bd434369.js');
+require('./ADlgInfeed-732fb987.js');
 require('./AuthorComponent-cb8b8128.js');
 var BlockContent = require('./BlockContent-f942392e.js');
 require('./smoothscroll-95231a70.js');

package/dist/cjs/QueueDeckExpanded.js

@@ -35,9 +35,9 @@ require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 require('./beam-9ffe0364.js');
 require('./AdSlot.js');
-var ADInfeed = require('./ADInfeed-9984cb73.js');
+var ADInfeed = require('./ADInfeed-9df26f11.js');
 var lodash = require('./lodash-fc2922d0.js');
-var ADlgInfeed = require('./ADlgInfeed-bd434369.js');
+var ADlgInfeed = require('./ADlgInfeed-732fb987.js');
 var AuthorComponent = require('./AuthorComponent-cb8b8128.js');
 var reactBootstrap = require('react-bootstrap');
 

package/dist/cjs/Ustream.js

@@ -8,6 +8,7 @@ require('./core.get-iterator-method-41e87ec1.js');
 require('./web.dom.iterable-43c3e277.js');
 var React = require('react');
 var React__default = _interopDefault(React);
+var main = require('./main-bc4db521.js');
 var slicedToArray = require('./slicedToArray-8063ee51.js');
 require('./iconBase-637d3f1e.js');
 var index_esm = require('./index.esm-fcdbd2c6.js');
@@ -67,7 +68,10 @@ var Ustream = function Ustream(_ref) {
       }
     } catch (err) {}
   }, []);
-
+  //return nothing if mobile
+  if (main.main_39) {
+    return null;
+  }
   return React__default.createElement(
     'div',
     { id: 'ustream-container', ref: ustreamContainer, style: { width: '' + currentWidth, marginBottom: '1rem' } },

package/dist/cjs/View.js

@@ -929,13 +929,12 @@ var ArticleQueue = function ArticleQueue(props) {
       setQueueData = _useState2[1];
 
   var refreshAD = function refreshAD(path) {
-    if (!main.main_39) {
-      var activeArticle = queueData.find(function (item) {
-        return item.url.current === path;
-      });
-
-      var targeting = getTargeting.getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
+    var activeArticle = queueData.find(function (item) {
+      return item.url.current === path;
+    });
+    var targeting = getTargeting.getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
 
+    if (!main.main_39) {
       index.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
           var slots = googletag.pubads().getSlots();
@@ -952,6 +951,28 @@ var ArticleQueue = function ArticleQueue(props) {
         }
       });
     }
+    //Refresh leaderboard ad on mobile
+    if (main.main_39) {
+      var leaderboardSlotId = '';
+      index.lib_3.getGoogletag().then(function (googletag) {
+        if (window.googletag && googletag.pubadsReady) {
+          var slots = googletag.pubads().getSlots();
+          slots.forEach(function (slot) {
+            var pos = slot.getTargeting('pos');
+            if (pos == 'top-mobile') {
+              //gets the slotId of the leaderboard ad to refresh
+              leaderboardSlotId = slot.getSlotId().getDomId();
+              slot.clearTargeting();
+              keys._Object$keys(targeting).forEach(function (key) {
+                slot.setTargeting(key, targeting[key]);
+              });
+              slot.setTargeting('pos', pos);
+            }
+          });
+          index.lib_3.refresh(leaderboardSlotId);
+        }
+      });
+    }
   };
 
   var checkSponseredArticle = function checkSponseredArticle(article) {

package/dist/cjs/index.js

@@ -40,10 +40,10 @@ require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 var Segment = require('./beam-9ffe0364.js');
 var AdSlot = require('./AdSlot.js');
-require('./ADInfeed-9984cb73.js');
+require('./ADInfeed-9df26f11.js');
 var DeckContent = require('./DeckContent.js');
 require('./lodash-fc2922d0.js');
-require('./ADlgInfeed-bd434369.js');
+require('./ADlgInfeed-732fb987.js');
 require('./_arrayMap-3b4a0f75.js');
 require('./get-5dfcdc33.js');
 var AD = require('./AD.js');

package/dist/esm/AD728x90.js

@@ -25,8 +25,7 @@ var AD728x90 = function AD728x90(_ref) {
       targeting = _ref$targeting === undefined ? {} : _ref$targeting,
       _ref$pos = _ref.pos,
       pos = _ref$pos === undefined ? 'top' : _ref$pos,
-      _ref$fixedPos = _ref.fixedPos,
-      fixedPos = _ref$fixedPos === undefined ? '60px' : _ref$fixedPos;
+      _ref$fixedPos = _ref.fixedPos;
 
   var mobileView = false;
   if (main_39) {
@@ -60,7 +59,7 @@ var AD728x90 = function AD728x90(_ref) {
     if (stickyAd && window.pageYOffset + (AdOffsetTop - navbar.offsetHeight) > AdOffsetTop) {
       if (adRef.current && adRef.current.style) {
         adRef.current.style.position = 'fixed';
-        adRef.current.style.top = fixedPos;
+        adRef.current.style.bottom = '0';
         adRef.current.style.left = '0px';
         adRef.current.style.zIndex = '9999';
         adRef.current.style.width = '100%';
@@ -87,27 +86,32 @@ var AD728x90 = function AD728x90(_ref) {
 
   return React__default.createElement(
     'div',
-    { className: 'leaderboard-ad-wrapper', ref: adRef, style: { backgroundColor: '#fff' } },
-    React__default.createElement(DFPAdSlot, {
-      setStickyAd: setStickyAd,
-      slotId: slotId,
-      networkID: networkID,
-      adUnit: adUnit,
-      targeting: adTargeting,
-      className: 'AD728x90',
-      sizes: mobileView ? mobileSizes : browserSizes,
-      sizeMapping: [{
-        viewport: [768, 1],
-        sizes: [[728, 90], [970, 90]]
-      }, {
-        viewport: [1, 1],
-        sizes: [[320, 50], [300, 50]]
-      }]
-    }),
+    { className: 'leaderboard-ad-wrapper', style: { backgroundColor: '#fff' } },
+    React__default.createElement(
+      'div',
+      { ref: adRef, style: { height: 'auto', background: '#fff' } },
+      React__default.createElement(DFPAdSlot, {
+
+        setStickyAd: setStickyAd,
+        slotId: slotId,
+        networkID: networkID,
+        adUnit: adUnit,
+        targeting: adTargeting,
+        className: 'AD728x90',
+        sizes: mobileView ? mobileSizes : browserSizes,
+        sizeMapping: [{
+          viewport: [768, 1],
+          sizes: [[728, 90], [970, 90]]
+        }, {
+          viewport: [1, 1],
+          sizes: [[320, 50], [300, 50]]
+        }]
+      })
+    ),
     React__default.createElement(
       'style',
       { jsx: 'true' },
-      '\n        .leaderboard-ad-wrapper {\n          min-height: 90px;\n        }\n        @media screen and (max-width: 768px) {\n          .leaderboard-ad-wrapper {\n            min-height: 50px;\n          }\n        }\n      '
+      '\n        .leaderboard-ad-wrapper {\n          min-height: 90px;\n        }\n        @media screen and (max-width: 768px) {\n          .leaderboard-ad-wrapper {\n            min-height: calc(50px + 1rem);\n          }\n        }\n      '
     )
   );
 };

package/dist/esm/AdSlot.js

@@ -65,6 +65,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
     'div',
     { className: className, style: { textAlign: 'center' } },
     React__default.createElement(lib_2, {
+      style: { marginBottom: '1rem' },
       slotId: slotId,
       sizes: sizes,
       adUnit: adUnit,

package/dist/esm/DeckContent.js

@@ -36,7 +36,7 @@ import './asyncToGenerator-0379e924.js';
 import './_set-species-6f64f1c1.js';
 import './beam-e248fb74.js';
 import './AdSlot.js';
-import { A as ADInfeed } from './ADInfeed-f2d3970d.js';
+import { A as ADInfeed } from './ADInfeed-383c2123.js';
 
 var DeckContent = function (_React$Component) {
   _inherits(DeckContent, _React$Component);

package/dist/esm/EventsDeck.js

@@ -1667,6 +1667,9 @@ var EventsDeck = function EventsDeck(_ref) {
           }
           return 0;
         });
+        if (filter.indexOf('end') >= 0) {
+          sortedEventsByStartData.reverse();
+        }
         setData(function (prevData) {
           return [].concat(_toConsumableArray(prevData), _toConsumableArray(sortedEventsByStartData));
         });

package/dist/esm/GridContent.js

@@ -36,9 +36,9 @@ import './asyncToGenerator-0379e924.js';
 import './_set-species-6f64f1c1.js';
 import './beam-e248fb74.js';
 import './AdSlot.js';
-import { A as ADInfeed } from './ADInfeed-f2d3970d.js';
+import { A as ADInfeed } from './ADInfeed-383c2123.js';
 import { l as lodash } from './lodash-17fdfebb.js';
-import { A as ADlgInfeed } from './ADlgInfeed-3c3c976a.js';
+import { A as ADlgInfeed } from './ADlgInfeed-e1a02b33.js';
 import './_arrayMap-a8dd2b2c.js';
 import { g as get_1 } from './get-ae817b75.js';
 import './AD.js';

package/dist/esm/IssueLanding.js

@@ -29,9 +29,9 @@ import './asyncToGenerator-0379e924.js';
 import './_set-species-6f64f1c1.js';
 import './beam-e248fb74.js';
 import './AdSlot.js';
-import './ADInfeed-f2d3970d.js';
+import './ADInfeed-383c2123.js';
 import './lodash-17fdfebb.js';
-import './ADlgInfeed-3c3c976a.js';
+import './ADlgInfeed-e1a02b33.js';
 import './AuthorComponent-158226c9.js';
 import 'react-bootstrap';
 import QueueDeckExpanded from './QueueDeckExpanded.js';

package/dist/esm/MasterDeck.js

@@ -34,9 +34,9 @@ import { _ as _Promise } from './asyncToGenerator-0379e924.js';
 import './_set-species-6f64f1c1.js';
 import './beam-e248fb74.js';
 import './AdSlot.js';
-import { A as ADInfeed } from './ADInfeed-f2d3970d.js';
+import { A as ADInfeed } from './ADInfeed-383c2123.js';
 import { l as lodash } from './lodash-17fdfebb.js';
-import { A as ADlgInfeed } from './ADlgInfeed-3c3c976a.js';
+import { A as ADlgInfeed } from './ADlgInfeed-e1a02b33.js';
 
 var MasterDeck = function (_React$Component) {
   _inherits(MasterDeck, _React$Component);

package/dist/esm/PartnerDetailListing.js

@@ -31,9 +31,9 @@ import { a as _asyncToGenerator, r as regenerator, _ as _Promise } from './async
 import './_set-species-6f64f1c1.js';
 import './beam-e248fb74.js';
 import './AdSlot.js';
-import './ADInfeed-f2d3970d.js';
+import './ADInfeed-383c2123.js';
 import './lodash-17fdfebb.js';
-import './ADlgInfeed-3c3c976a.js';
+import './ADlgInfeed-e1a02b33.js';
 import './AuthorComponent-158226c9.js';
 import { B as BlockContent } from './BlockContent-a614acdf.js';
 import './smoothscroll-4b699764.js';

package/dist/esm/QueueDeckExpanded.js

@@ -29,9 +29,9 @@ import './asyncToGenerator-0379e924.js';
 import './_set-species-6f64f1c1.js';
 import './beam-e248fb74.js';
 import './AdSlot.js';
-import { A as ADInfeed } from './ADInfeed-f2d3970d.js';
+import { A as ADInfeed } from './ADInfeed-383c2123.js';
 import { l as lodash } from './lodash-17fdfebb.js';
-import { A as ADlgInfeed } from './ADlgInfeed-3c3c976a.js';
+import { A as ADlgInfeed } from './ADlgInfeed-e1a02b33.js';
 import { A as AuthorComponent } from './AuthorComponent-158226c9.js';
 import { Container, Media } from 'react-bootstrap';
 

package/dist/esm/Ustream.js

@@ -3,6 +3,7 @@ import './_to-object-16fd8b46.js';
 import './core.get-iterator-method-f5c0d66a.js';
 import './web.dom.iterable-46c95e52.js';
 import React__default, { useState, useRef, useEffect } from 'react';
+import { m as main_39 } from './main-7255814e.js';
 import { _ as _slicedToArray } from './slicedToArray-f1e40361.js';
 import './iconBase-6ee2f2fb.js';
 import { d as IoIosOpen } from './index.esm-b97cf389.js';
@@ -62,7 +63,10 @@ var Ustream = function Ustream(_ref) {
       }
     } catch (err) {}
   }, []);
-
+  //return nothing if mobile
+  if (main_39) {
+    return null;
+  }
   return React__default.createElement(
     'div',
     { id: 'ustream-container', ref: ustreamContainer, style: { width: '' + currentWidth, marginBottom: '1rem' } },

package/dist/esm/View.js

@@ -924,13 +924,12 @@ var ArticleQueue = function ArticleQueue(props) {
       setQueueData = _useState2[1];
 
   var refreshAD = function refreshAD(path) {
-    if (!main_39) {
-      var activeArticle = queueData.find(function (item) {
-        return item.url.current === path;
-      });
-
-      var targeting = getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
+    var activeArticle = queueData.find(function (item) {
+      return item.url.current === path;
+    });
+    var targeting = getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
 
+    if (!main_39) {
       lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
           var slots = googletag.pubads().getSlots();
@@ -947,6 +946,28 @@ var ArticleQueue = function ArticleQueue(props) {
         }
       });
     }
+    //Refresh leaderboard ad on mobile
+    if (main_39) {
+      var leaderboardSlotId = '';
+      lib_3.getGoogletag().then(function (googletag) {
+        if (window.googletag && googletag.pubadsReady) {
+          var slots = googletag.pubads().getSlots();
+          slots.forEach(function (slot) {
+            var pos = slot.getTargeting('pos');
+            if (pos == 'top-mobile') {
+              //gets the slotId of the leaderboard ad to refresh
+              leaderboardSlotId = slot.getSlotId().getDomId();
+              slot.clearTargeting();
+              _Object$keys(targeting).forEach(function (key) {
+                slot.setTargeting(key, targeting[key]);
+              });
+              slot.setTargeting('pos', pos);
+            }
+          });
+          lib_3.refresh(leaderboardSlotId);
+        }
+      });
+    }
   };
 
   var checkSponseredArticle = function checkSponseredArticle(article) {

package/dist/esm/index.js

@@ -36,10 +36,10 @@ import './asyncToGenerator-0379e924.js';
 import './_set-species-6f64f1c1.js';
 export { B as Beam, S as Segment } from './beam-e248fb74.js';
 export { default as AdSlot } from './AdSlot.js';
-import './ADInfeed-f2d3970d.js';
+import './ADInfeed-383c2123.js';
 export { default as DeckContent } from './DeckContent.js';
 import './lodash-17fdfebb.js';
-import './ADlgInfeed-3c3c976a.js';
+import './ADlgInfeed-e1a02b33.js';
 import './_arrayMap-a8dd2b2c.js';
 import './get-ae817b75.js';
 export { default as AD } from './AD.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.481",
+  "version": "1.0.483",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",