@mjhls/mjh-framework 1.0.482 → 1.0.483

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -30,8 +30,7 @@ var AD728x90 = function AD728x90(_ref) {
30
30
  targeting = _ref$targeting === undefined ? {} : _ref$targeting,
31
31
  _ref$pos = _ref.pos,
32
32
  pos = _ref$pos === undefined ? 'top' : _ref$pos,
33
- _ref$fixedPos = _ref.fixedPos,
34
- fixedPos = _ref$fixedPos === undefined ? '60px' : _ref$fixedPos;
33
+ _ref$fixedPos = _ref.fixedPos;
35
34
 
36
35
  var mobileView = false;
37
36
  if (main.main_39) {
@@ -65,7 +64,7 @@ var AD728x90 = function AD728x90(_ref) {
65
64
  if (stickyAd && window.pageYOffset + (AdOffsetTop - navbar.offsetHeight) > AdOffsetTop) {
66
65
  if (adRef.current && adRef.current.style) {
67
66
  adRef.current.style.position = 'fixed';
68
- adRef.current.style.top = fixedPos;
67
+ adRef.current.style.bottom = '0';
69
68
  adRef.current.style.left = '0px';
70
69
  adRef.current.style.zIndex = '9999';
71
70
  adRef.current.style.width = '100%';
@@ -92,27 +91,32 @@ var AD728x90 = function AD728x90(_ref) {
92
91
 
93
92
  return React__default.createElement(
94
93
  'div',
95
- { className: 'leaderboard-ad-wrapper', ref: adRef, style: { backgroundColor: '#fff' } },
96
- React__default.createElement(AdSlot, {
97
- setStickyAd: setStickyAd,
98
- slotId: slotId,
99
- networkID: networkID,
100
- adUnit: adUnit,
101
- targeting: adTargeting,
102
- className: 'AD728x90',
103
- sizes: mobileView ? mobileSizes : browserSizes,
104
- sizeMapping: [{
105
- viewport: [768, 1],
106
- sizes: [[728, 90], [970, 90]]
107
- }, {
108
- viewport: [1, 1],
109
- sizes: [[320, 50], [300, 50]]
110
- }]
111
- }),
94
+ { className: 'leaderboard-ad-wrapper', style: { backgroundColor: '#fff' } },
95
+ React__default.createElement(
96
+ 'div',
97
+ { ref: adRef, style: { height: 'auto', background: '#fff' } },
98
+ React__default.createElement(AdSlot, {
99
+
100
+ setStickyAd: setStickyAd,
101
+ slotId: slotId,
102
+ networkID: networkID,
103
+ adUnit: adUnit,
104
+ targeting: adTargeting,
105
+ className: 'AD728x90',
106
+ sizes: mobileView ? mobileSizes : browserSizes,
107
+ sizeMapping: [{
108
+ viewport: [768, 1],
109
+ sizes: [[728, 90], [970, 90]]
110
+ }, {
111
+ viewport: [1, 1],
112
+ sizes: [[320, 50], [300, 50]]
113
+ }]
114
+ })
115
+ ),
112
116
  React__default.createElement(
113
117
  'style',
114
118
  { jsx: 'true' },
115
- '\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 '
119
+ '\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 '
116
120
  )
117
121
  );
118
122
  };
@@ -70,6 +70,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
70
70
  'div',
71
71
  { className: className, style: { textAlign: 'center' } },
72
72
  React__default.createElement(index.lib_2, {
73
+ style: { marginBottom: '1rem' },
73
74
  slotId: slotId,
74
75
  sizes: sizes,
75
76
  adUnit: adUnit,
@@ -42,7 +42,7 @@ require('./asyncToGenerator-8e707718.js');
42
42
  require('./_set-species-4458e975.js');
43
43
  require('./beam-9ffe0364.js');
44
44
  require('./AdSlot.js');
45
- var ADInfeed = require('./ADInfeed-9984cb73.js');
45
+ var ADInfeed = require('./ADInfeed-9df26f11.js');
46
46
 
47
47
  var DeckContent = function (_React$Component) {
48
48
  inherits._inherits(DeckContent, _React$Component);
@@ -42,9 +42,9 @@ require('./asyncToGenerator-8e707718.js');
42
42
  require('./_set-species-4458e975.js');
43
43
  require('./beam-9ffe0364.js');
44
44
  require('./AdSlot.js');
45
- var ADInfeed = require('./ADInfeed-9984cb73.js');
45
+ var ADInfeed = require('./ADInfeed-9df26f11.js');
46
46
  var lodash = require('./lodash-fc2922d0.js');
47
- var ADlgInfeed = require('./ADlgInfeed-bd434369.js');
47
+ var ADlgInfeed = require('./ADlgInfeed-732fb987.js');
48
48
  require('./_arrayMap-3b4a0f75.js');
49
49
  var get = require('./get-5dfcdc33.js');
50
50
  require('./AD.js');
@@ -34,9 +34,9 @@ require('./asyncToGenerator-8e707718.js');
34
34
  require('./_set-species-4458e975.js');
35
35
  require('./beam-9ffe0364.js');
36
36
  require('./AdSlot.js');
37
- require('./ADInfeed-9984cb73.js');
37
+ require('./ADInfeed-9df26f11.js');
38
38
  require('./lodash-fc2922d0.js');
39
- require('./ADlgInfeed-bd434369.js');
39
+ require('./ADlgInfeed-732fb987.js');
40
40
  require('./AuthorComponent-cb8b8128.js');
41
41
  require('react-bootstrap');
42
42
  var QueueDeckExpanded = require('./QueueDeckExpanded.js');
@@ -40,9 +40,9 @@ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
40
40
  require('./_set-species-4458e975.js');
41
41
  require('./beam-9ffe0364.js');
42
42
  require('./AdSlot.js');
43
- var ADInfeed = require('./ADInfeed-9984cb73.js');
43
+ var ADInfeed = require('./ADInfeed-9df26f11.js');
44
44
  var lodash = require('./lodash-fc2922d0.js');
45
- var ADlgInfeed = require('./ADlgInfeed-bd434369.js');
45
+ var ADlgInfeed = require('./ADlgInfeed-732fb987.js');
46
46
 
47
47
  var MasterDeck = function (_React$Component) {
48
48
  inherits._inherits(MasterDeck, _React$Component);
@@ -36,9 +36,9 @@ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
36
36
  require('./_set-species-4458e975.js');
37
37
  require('./beam-9ffe0364.js');
38
38
  require('./AdSlot.js');
39
- require('./ADInfeed-9984cb73.js');
39
+ require('./ADInfeed-9df26f11.js');
40
40
  require('./lodash-fc2922d0.js');
41
- require('./ADlgInfeed-bd434369.js');
41
+ require('./ADlgInfeed-732fb987.js');
42
42
  require('./AuthorComponent-cb8b8128.js');
43
43
  var BlockContent = require('./BlockContent-f942392e.js');
44
44
  require('./smoothscroll-95231a70.js');
@@ -35,9 +35,9 @@ require('./asyncToGenerator-8e707718.js');
35
35
  require('./_set-species-4458e975.js');
36
36
  require('./beam-9ffe0364.js');
37
37
  require('./AdSlot.js');
38
- var ADInfeed = require('./ADInfeed-9984cb73.js');
38
+ var ADInfeed = require('./ADInfeed-9df26f11.js');
39
39
  var lodash = require('./lodash-fc2922d0.js');
40
- var ADlgInfeed = require('./ADlgInfeed-bd434369.js');
40
+ var ADlgInfeed = require('./ADlgInfeed-732fb987.js');
41
41
  var AuthorComponent = require('./AuthorComponent-cb8b8128.js');
42
42
  var reactBootstrap = require('react-bootstrap');
43
43
 
@@ -8,6 +8,7 @@ require('./core.get-iterator-method-41e87ec1.js');
8
8
  require('./web.dom.iterable-43c3e277.js');
9
9
  var React = require('react');
10
10
  var React__default = _interopDefault(React);
11
+ var main = require('./main-bc4db521.js');
11
12
  var slicedToArray = require('./slicedToArray-8063ee51.js');
12
13
  require('./iconBase-637d3f1e.js');
13
14
  var index_esm = require('./index.esm-fcdbd2c6.js');
@@ -67,7 +68,10 @@ var Ustream = function Ustream(_ref) {
67
68
  }
68
69
  } catch (err) {}
69
70
  }, []);
70
-
71
+ //return nothing if mobile
72
+ if (main.main_39) {
73
+ return null;
74
+ }
71
75
  return React__default.createElement(
72
76
  'div',
73
77
  { id: 'ustream-container', ref: ustreamContainer, style: { width: '' + currentWidth, marginBottom: '1rem' } },
package/dist/cjs/View.js CHANGED
@@ -929,13 +929,12 @@ var ArticleQueue = function ArticleQueue(props) {
929
929
  setQueueData = _useState2[1];
930
930
 
931
931
  var refreshAD = function refreshAD(path) {
932
- if (!main.main_39) {
933
- var activeArticle = queueData.find(function (item) {
934
- return item.url.current === path;
935
- });
936
-
937
- var targeting = getTargeting.getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
932
+ var activeArticle = queueData.find(function (item) {
933
+ return item.url.current === path;
934
+ });
935
+ var targeting = getTargeting.getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
938
936
 
937
+ if (!main.main_39) {
939
938
  index.lib_3.getGoogletag().then(function (googletag) {
940
939
  if (window.googletag && googletag.pubadsReady) {
941
940
  var slots = googletag.pubads().getSlots();
@@ -952,6 +951,28 @@ var ArticleQueue = function ArticleQueue(props) {
952
951
  }
953
952
  });
954
953
  }
954
+ //Refresh leaderboard ad on mobile
955
+ if (main.main_39) {
956
+ var leaderboardSlotId = '';
957
+ index.lib_3.getGoogletag().then(function (googletag) {
958
+ if (window.googletag && googletag.pubadsReady) {
959
+ var slots = googletag.pubads().getSlots();
960
+ slots.forEach(function (slot) {
961
+ var pos = slot.getTargeting('pos');
962
+ if (pos == 'top-mobile') {
963
+ //gets the slotId of the leaderboard ad to refresh
964
+ leaderboardSlotId = slot.getSlotId().getDomId();
965
+ slot.clearTargeting();
966
+ keys._Object$keys(targeting).forEach(function (key) {
967
+ slot.setTargeting(key, targeting[key]);
968
+ });
969
+ slot.setTargeting('pos', pos);
970
+ }
971
+ });
972
+ index.lib_3.refresh(leaderboardSlotId);
973
+ }
974
+ });
975
+ }
955
976
  };
956
977
 
957
978
  var checkSponseredArticle = function checkSponseredArticle(article) {
package/dist/cjs/index.js CHANGED
@@ -40,10 +40,10 @@ require('./asyncToGenerator-8e707718.js');
40
40
  require('./_set-species-4458e975.js');
41
41
  var Segment = require('./beam-9ffe0364.js');
42
42
  var AdSlot = require('./AdSlot.js');
43
- require('./ADInfeed-9984cb73.js');
43
+ require('./ADInfeed-9df26f11.js');
44
44
  var DeckContent = require('./DeckContent.js');
45
45
  require('./lodash-fc2922d0.js');
46
- require('./ADlgInfeed-bd434369.js');
46
+ require('./ADlgInfeed-732fb987.js');
47
47
  require('./_arrayMap-3b4a0f75.js');
48
48
  require('./get-5dfcdc33.js');
49
49
  var AD = require('./AD.js');
@@ -25,8 +25,7 @@ var AD728x90 = function AD728x90(_ref) {
25
25
  targeting = _ref$targeting === undefined ? {} : _ref$targeting,
26
26
  _ref$pos = _ref.pos,
27
27
  pos = _ref$pos === undefined ? 'top' : _ref$pos,
28
- _ref$fixedPos = _ref.fixedPos,
29
- fixedPos = _ref$fixedPos === undefined ? '60px' : _ref$fixedPos;
28
+ _ref$fixedPos = _ref.fixedPos;
30
29
 
31
30
  var mobileView = false;
32
31
  if (main_39) {
@@ -60,7 +59,7 @@ var AD728x90 = function AD728x90(_ref) {
60
59
  if (stickyAd && window.pageYOffset + (AdOffsetTop - navbar.offsetHeight) > AdOffsetTop) {
61
60
  if (adRef.current && adRef.current.style) {
62
61
  adRef.current.style.position = 'fixed';
63
- adRef.current.style.top = fixedPos;
62
+ adRef.current.style.bottom = '0';
64
63
  adRef.current.style.left = '0px';
65
64
  adRef.current.style.zIndex = '9999';
66
65
  adRef.current.style.width = '100%';
@@ -87,27 +86,32 @@ var AD728x90 = function AD728x90(_ref) {
87
86
 
88
87
  return React__default.createElement(
89
88
  'div',
90
- { className: 'leaderboard-ad-wrapper', ref: adRef, style: { backgroundColor: '#fff' } },
91
- React__default.createElement(DFPAdSlot, {
92
- setStickyAd: setStickyAd,
93
- slotId: slotId,
94
- networkID: networkID,
95
- adUnit: adUnit,
96
- targeting: adTargeting,
97
- className: 'AD728x90',
98
- sizes: mobileView ? mobileSizes : browserSizes,
99
- sizeMapping: [{
100
- viewport: [768, 1],
101
- sizes: [[728, 90], [970, 90]]
102
- }, {
103
- viewport: [1, 1],
104
- sizes: [[320, 50], [300, 50]]
105
- }]
106
- }),
89
+ { className: 'leaderboard-ad-wrapper', style: { backgroundColor: '#fff' } },
90
+ React__default.createElement(
91
+ 'div',
92
+ { ref: adRef, style: { height: 'auto', background: '#fff' } },
93
+ React__default.createElement(DFPAdSlot, {
94
+
95
+ setStickyAd: setStickyAd,
96
+ slotId: slotId,
97
+ networkID: networkID,
98
+ adUnit: adUnit,
99
+ targeting: adTargeting,
100
+ className: 'AD728x90',
101
+ sizes: mobileView ? mobileSizes : browserSizes,
102
+ sizeMapping: [{
103
+ viewport: [768, 1],
104
+ sizes: [[728, 90], [970, 90]]
105
+ }, {
106
+ viewport: [1, 1],
107
+ sizes: [[320, 50], [300, 50]]
108
+ }]
109
+ })
110
+ ),
107
111
  React__default.createElement(
108
112
  'style',
109
113
  { jsx: 'true' },
110
- '\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 '
114
+ '\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 '
111
115
  )
112
116
  );
113
117
  };
@@ -65,6 +65,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
65
65
  'div',
66
66
  { className: className, style: { textAlign: 'center' } },
67
67
  React__default.createElement(lib_2, {
68
+ style: { marginBottom: '1rem' },
68
69
  slotId: slotId,
69
70
  sizes: sizes,
70
71
  adUnit: adUnit,
@@ -36,7 +36,7 @@ import './asyncToGenerator-0379e924.js';
36
36
  import './_set-species-6f64f1c1.js';
37
37
  import './beam-e248fb74.js';
38
38
  import './AdSlot.js';
39
- import { A as ADInfeed } from './ADInfeed-f2d3970d.js';
39
+ import { A as ADInfeed } from './ADInfeed-383c2123.js';
40
40
 
41
41
  var DeckContent = function (_React$Component) {
42
42
  _inherits(DeckContent, _React$Component);
@@ -36,9 +36,9 @@ import './asyncToGenerator-0379e924.js';
36
36
  import './_set-species-6f64f1c1.js';
37
37
  import './beam-e248fb74.js';
38
38
  import './AdSlot.js';
39
- import { A as ADInfeed } from './ADInfeed-f2d3970d.js';
39
+ import { A as ADInfeed } from './ADInfeed-383c2123.js';
40
40
  import { l as lodash } from './lodash-17fdfebb.js';
41
- import { A as ADlgInfeed } from './ADlgInfeed-3c3c976a.js';
41
+ import { A as ADlgInfeed } from './ADlgInfeed-e1a02b33.js';
42
42
  import './_arrayMap-a8dd2b2c.js';
43
43
  import { g as get_1 } from './get-ae817b75.js';
44
44
  import './AD.js';
@@ -29,9 +29,9 @@ import './asyncToGenerator-0379e924.js';
29
29
  import './_set-species-6f64f1c1.js';
30
30
  import './beam-e248fb74.js';
31
31
  import './AdSlot.js';
32
- import './ADInfeed-f2d3970d.js';
32
+ import './ADInfeed-383c2123.js';
33
33
  import './lodash-17fdfebb.js';
34
- import './ADlgInfeed-3c3c976a.js';
34
+ import './ADlgInfeed-e1a02b33.js';
35
35
  import './AuthorComponent-158226c9.js';
36
36
  import 'react-bootstrap';
37
37
  import QueueDeckExpanded from './QueueDeckExpanded.js';
@@ -34,9 +34,9 @@ import { _ as _Promise } from './asyncToGenerator-0379e924.js';
34
34
  import './_set-species-6f64f1c1.js';
35
35
  import './beam-e248fb74.js';
36
36
  import './AdSlot.js';
37
- import { A as ADInfeed } from './ADInfeed-f2d3970d.js';
37
+ import { A as ADInfeed } from './ADInfeed-383c2123.js';
38
38
  import { l as lodash } from './lodash-17fdfebb.js';
39
- import { A as ADlgInfeed } from './ADlgInfeed-3c3c976a.js';
39
+ import { A as ADlgInfeed } from './ADlgInfeed-e1a02b33.js';
40
40
 
41
41
  var MasterDeck = function (_React$Component) {
42
42
  _inherits(MasterDeck, _React$Component);
@@ -31,9 +31,9 @@ import { a as _asyncToGenerator, r as regenerator, _ as _Promise } from './async
31
31
  import './_set-species-6f64f1c1.js';
32
32
  import './beam-e248fb74.js';
33
33
  import './AdSlot.js';
34
- import './ADInfeed-f2d3970d.js';
34
+ import './ADInfeed-383c2123.js';
35
35
  import './lodash-17fdfebb.js';
36
- import './ADlgInfeed-3c3c976a.js';
36
+ import './ADlgInfeed-e1a02b33.js';
37
37
  import './AuthorComponent-158226c9.js';
38
38
  import { B as BlockContent } from './BlockContent-a614acdf.js';
39
39
  import './smoothscroll-4b699764.js';
@@ -29,9 +29,9 @@ import './asyncToGenerator-0379e924.js';
29
29
  import './_set-species-6f64f1c1.js';
30
30
  import './beam-e248fb74.js';
31
31
  import './AdSlot.js';
32
- import { A as ADInfeed } from './ADInfeed-f2d3970d.js';
32
+ import { A as ADInfeed } from './ADInfeed-383c2123.js';
33
33
  import { l as lodash } from './lodash-17fdfebb.js';
34
- import { A as ADlgInfeed } from './ADlgInfeed-3c3c976a.js';
34
+ import { A as ADlgInfeed } from './ADlgInfeed-e1a02b33.js';
35
35
  import { A as AuthorComponent } from './AuthorComponent-158226c9.js';
36
36
  import { Container, Media } from 'react-bootstrap';
37
37
 
@@ -3,6 +3,7 @@ import './_to-object-16fd8b46.js';
3
3
  import './core.get-iterator-method-f5c0d66a.js';
4
4
  import './web.dom.iterable-46c95e52.js';
5
5
  import React__default, { useState, useRef, useEffect } from 'react';
6
+ import { m as main_39 } from './main-7255814e.js';
6
7
  import { _ as _slicedToArray } from './slicedToArray-f1e40361.js';
7
8
  import './iconBase-6ee2f2fb.js';
8
9
  import { d as IoIosOpen } from './index.esm-b97cf389.js';
@@ -62,7 +63,10 @@ var Ustream = function Ustream(_ref) {
62
63
  }
63
64
  } catch (err) {}
64
65
  }, []);
65
-
66
+ //return nothing if mobile
67
+ if (main_39) {
68
+ return null;
69
+ }
66
70
  return React__default.createElement(
67
71
  'div',
68
72
  { id: 'ustream-container', ref: ustreamContainer, style: { width: '' + currentWidth, marginBottom: '1rem' } },
package/dist/esm/View.js CHANGED
@@ -924,13 +924,12 @@ var ArticleQueue = function ArticleQueue(props) {
924
924
  setQueueData = _useState2[1];
925
925
 
926
926
  var refreshAD = function refreshAD(path) {
927
- if (!main_39) {
928
- var activeArticle = queueData.find(function (item) {
929
- return item.url.current === path;
930
- });
931
-
932
- var targeting = getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
927
+ var activeArticle = queueData.find(function (item) {
928
+ return item.url.current === path;
929
+ });
930
+ var targeting = getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
933
931
 
932
+ if (!main_39) {
934
933
  lib_3.getGoogletag().then(function (googletag) {
935
934
  if (window.googletag && googletag.pubadsReady) {
936
935
  var slots = googletag.pubads().getSlots();
@@ -947,6 +946,28 @@ var ArticleQueue = function ArticleQueue(props) {
947
946
  }
948
947
  });
949
948
  }
949
+ //Refresh leaderboard ad on mobile
950
+ if (main_39) {
951
+ var leaderboardSlotId = '';
952
+ lib_3.getGoogletag().then(function (googletag) {
953
+ if (window.googletag && googletag.pubadsReady) {
954
+ var slots = googletag.pubads().getSlots();
955
+ slots.forEach(function (slot) {
956
+ var pos = slot.getTargeting('pos');
957
+ if (pos == 'top-mobile') {
958
+ //gets the slotId of the leaderboard ad to refresh
959
+ leaderboardSlotId = slot.getSlotId().getDomId();
960
+ slot.clearTargeting();
961
+ _Object$keys(targeting).forEach(function (key) {
962
+ slot.setTargeting(key, targeting[key]);
963
+ });
964
+ slot.setTargeting('pos', pos);
965
+ }
966
+ });
967
+ lib_3.refresh(leaderboardSlotId);
968
+ }
969
+ });
970
+ }
950
971
  };
951
972
 
952
973
  var checkSponseredArticle = function checkSponseredArticle(article) {
package/dist/esm/index.js CHANGED
@@ -36,10 +36,10 @@ import './asyncToGenerator-0379e924.js';
36
36
  import './_set-species-6f64f1c1.js';
37
37
  export { B as Beam, S as Segment } from './beam-e248fb74.js';
38
38
  export { default as AdSlot } from './AdSlot.js';
39
- import './ADInfeed-f2d3970d.js';
39
+ import './ADInfeed-383c2123.js';
40
40
  export { default as DeckContent } from './DeckContent.js';
41
41
  import './lodash-17fdfebb.js';
42
- import './ADlgInfeed-3c3c976a.js';
42
+ import './ADlgInfeed-e1a02b33.js';
43
43
  import './_arrayMap-a8dd2b2c.js';
44
44
  import './get-ae817b75.js';
45
45
  export { default as AD } from './AD.js';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.482",
3
+ "version": "1.0.483",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",