@mjhls/mjh-framework 1.0.265 → 1.0.266

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.
package/README.md CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- # mjh-framework v. 1.0.265
2
+ # mjh-framework v. 1.0.266
3
3
 
4
4
  > Foundation Framework
5
5
 
@@ -287,7 +287,7 @@ var DeckContent = function (_React$Component) {
287
287
  { className: 'brand-insight-wrapper', sm: 12, counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
288
288
  React__default.createElement(
289
289
  Card,
290
- { className: 'content-card ad-wrapper', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
290
+ { className: 'ad-wrapper', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
291
291
  React__default.createElement(
292
292
  'div',
293
293
  { style: { width: '100%', height: 'auto' } },
@@ -521,7 +521,7 @@ var GridContent = function (_React$Component) {
521
521
  { className: 'brand-insight-wrapper', counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
522
522
  React__default.createElement(
523
523
  Card,
524
- { className: 'content-card ad-wrapper', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
524
+ { className: 'ad-wrapper', style: { display: 'block !important', flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
525
525
  React__default.createElement(AdSlot.DFPAdSlot, { className: row.className, networkID: row.networkID, adUnit: row.adUnit, slotId: row.slotId, targeting: row.targeting, sizes: row.sizes })
526
526
  )
527
527
  )
@@ -27,7 +27,7 @@ require('./slicedToArray-e38fb29d.js');
27
27
  require('./AdSlot-1c436555.js');
28
28
  require('./promise-b96c61f8.js');
29
29
  require('./get-1f91592f.js');
30
- var GridContent = require('./GridContent-68dc29f1.js');
30
+ var GridContent = require('./GridContent-e459f9e3.js');
31
31
 
32
32
 
33
33
 
@@ -4,6 +4,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
4
4
 
5
5
  var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
6
6
  var main = require('./main-0ea1b808.js');
7
+ var _extends$2 = require('./extends-e94dbea5.js');
7
8
  var React = require('react');
8
9
  var React__default = _interopDefault(React);
9
10
  var PropTypes = _interopDefault(require('prop-types'));
@@ -2355,20 +2356,30 @@ var AD728x90 = function AD728x90(_ref) {
2355
2356
  adUnit = _ref.adUnit,
2356
2357
  slotId = _ref.slotId,
2357
2358
  _ref$targeting = _ref.targeting,
2358
- targeting = _ref$targeting === undefined ? {} : _ref$targeting;
2359
+ targeting = _ref$targeting === undefined ? {} : _ref$targeting,
2360
+ pos = _ref.pos;
2359
2361
 
2360
2362
  var _useState = React.useState(),
2361
2363
  _useState2 = slicedToArray._slicedToArray(_useState, 2),
2362
2364
  mobileView = _useState2[0],
2363
2365
  setMobileView = _useState2[1];
2364
2366
 
2367
+ var adt = _extends$2._extends({}, targeting);
2368
+
2369
+ var _useState3 = React.useState(adt),
2370
+ _useState4 = slicedToArray._slicedToArray(_useState3, 2),
2371
+ adTargeting = _useState4[0],
2372
+ setTargeting = _useState4[1];
2373
+
2365
2374
  React.useEffect(function () {
2366
2375
  if (window && window.innerWidth && window.innerWidth < 768) {
2367
2376
  setMobileView(true);
2377
+ adTargeting['pos'] = pos && pos.length ? pos : 'top-mobile';
2368
2378
  } else {
2369
2379
  setMobileView(false);
2380
+ adTargeting['pos'] = pos && pos.length ? pos : 'top';
2370
2381
  }
2371
- }, []);
2382
+ }, [adTargeting, pos]);
2372
2383
 
2373
2384
  var browserSizes = [[728, 90], [970, 90], [320, 50], [300, 50]];
2374
2385
  var mobileSizes = [[320, 50], [300, 50]];
@@ -2377,7 +2388,7 @@ var AD728x90 = function AD728x90(_ref) {
2377
2388
  slotId: slotId,
2378
2389
  networkID: networkID,
2379
2390
  adUnit: adUnit,
2380
- targeting: targeting,
2391
+ targeting: adTargeting,
2381
2392
  className: 'AD728x90',
2382
2393
  sizes: mobileView ? mobileSizes : browserSizes,
2383
2394
  sizeMapping: [{
@@ -6,6 +6,7 @@ require('./web.dom.iterable-0998bdc3.js');
6
6
  require('./debounce-783eb233.js');
7
7
  require('./main-0ea1b808.js');
8
8
  require('./core.get-iterator-method-e049ca4a.js');
9
+ require('./extends-e94dbea5.js');
9
10
  require('react');
10
11
  require('./index-fa3cec70.js');
11
12
  require('prop-types');
@@ -20,7 +21,7 @@ require('./get-1f91592f.js');
20
21
  require('react-bootstrap');
21
22
  require('./index.esm-340d3792.js');
22
23
  require('react-bootstrap/Button');
23
- var TemplateNormal = require('./Normal-d5d437f2.js');
24
+ var TemplateNormal = require('./Normal-8c148732.js');
24
25
  require('react-bootstrap/ListGroup');
25
26
  require('next/head');
26
27
  require('react-bootstrap/Nav');
package/dist/cjs/index.js CHANGED
@@ -34,7 +34,7 @@ var AdSlot = require('./AdSlot-1c436555.js');
34
34
  require('./promise-b96c61f8.js');
35
35
  var DeckContent = require('./DeckContent.js');
36
36
  require('./get-1f91592f.js');
37
- var GridContent = require('./GridContent-68dc29f1.js');
37
+ var GridContent = require('./GridContent-e459f9e3.js');
38
38
  var DeckQueue = require('./DeckQueue.js');
39
39
  require('react-bootstrap/Media');
40
40
  var ThumbnailCard = require('./ThumbnailCard.js');
@@ -52,7 +52,7 @@ var IssueDeck = require('./IssueDeck.js');
52
52
  require('react-bootstrap/Badge');
53
53
  var IssueContentDeck = require('./IssueContentDeck.js');
54
54
  var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
55
- var TemplateNormal = require('./Normal-d5d437f2.js');
55
+ var TemplateNormal = require('./Normal-8c148732.js');
56
56
  require('react-bootstrap/ListGroup');
57
57
  var Head = _interopDefault(require('next/head'));
58
58
  var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -2761,16 +2761,35 @@ var AD300x250 = function AD300x250(_ref) {
2761
2761
  adUnit = _ref.adUnit,
2762
2762
  slotId = _ref.slotId,
2763
2763
  _ref$targeting = _ref.targeting,
2764
- targeting = _ref$targeting === undefined ? {} : _ref$targeting;
2765
-
2766
- return React__default.createElement(AdSlot.DFPAdSlot, {
2767
- networkID: networkID,
2768
- adUnit: adUnit,
2769
- slotId: slotId,
2770
- targeting: targeting,
2771
- className: 'AD300x250',
2772
- sizes: [[300, 250], [300, 100]]
2773
- });
2764
+ targeting = _ref$targeting === undefined ? {} : _ref$targeting,
2765
+ pos = _ref.pos;
2766
+
2767
+ var _useState = React.useState(),
2768
+ _useState2 = slicedToArray._slicedToArray(_useState, 2),
2769
+ mobileView = _useState2[0],
2770
+ setMobileView = _useState2[1];
2771
+
2772
+ var adt = _extends$2._extends({}, targeting);
2773
+
2774
+ var _useState3 = React.useState(adt),
2775
+ _useState4 = slicedToArray._slicedToArray(_useState3, 2),
2776
+ adTargeting = _useState4[0],
2777
+ setTargeting = _useState4[1];
2778
+
2779
+ React.useEffect(function () {
2780
+ if (window && window.innerWidth && window.innerWidth < 768) {
2781
+ setMobileView(true);
2782
+ adTargeting['pos'] = pos && pos.length ? pos : 'rec1-mobile';
2783
+ } else {
2784
+ setMobileView(false);
2785
+ adTargeting['pos'] = pos && pos.length ? pos : 'rec1';
2786
+ }
2787
+ }, [adTargeting, pos]);
2788
+
2789
+ var browserSizes = [[300, 250], [300, 100]];
2790
+ var mobileSizes = [[300, 50][(50)], [300, 250], [300, 100]];
2791
+
2792
+ return React__default.createElement(AdSlot.DFPAdSlot, { networkID: networkID, adUnit: adUnit, slotId: slotId, targeting: adTargeting, className: 'AD300x250', sizes: mobileView ? mobileSizes : browserSizes });
2774
2793
  };
2775
2794
 
2776
2795
  var AD300x250x600 = function AD300x250x600(_ref) {
@@ -2778,16 +2797,35 @@ var AD300x250x600 = function AD300x250x600(_ref) {
2778
2797
  adUnit = _ref.adUnit,
2779
2798
  slotId = _ref.slotId,
2780
2799
  _ref$targeting = _ref.targeting,
2781
- targeting = _ref$targeting === undefined ? {} : _ref$targeting;
2782
-
2783
- return React__default.createElement(AdSlot.DFPAdSlot, {
2784
- networkID: networkID,
2785
- adUnit: adUnit,
2786
- className: 'AD300x250',
2787
- slotId: slotId,
2788
- targeting: targeting,
2789
- sizes: [[300, 250], [300, 600], [300, 100]]
2790
- });
2800
+ targeting = _ref$targeting === undefined ? {} : _ref$targeting,
2801
+ pos = _ref.pos;
2802
+
2803
+ var _useState = React.useState(),
2804
+ _useState2 = slicedToArray._slicedToArray(_useState, 2),
2805
+ mobileView = _useState2[0],
2806
+ setMobileView = _useState2[1];
2807
+
2808
+ var adt = _extends$2._extends({}, targeting);
2809
+
2810
+ var _useState3 = React.useState(adt),
2811
+ _useState4 = slicedToArray._slicedToArray(_useState3, 2),
2812
+ adTargeting = _useState4[0],
2813
+ setTargeting = _useState4[1];
2814
+
2815
+ React.useEffect(function () {
2816
+ if (window && window.innerWidth && window.innerWidth < 768) {
2817
+ setMobileView(true);
2818
+ adTargeting['pos'] = pos && pos.length ? pos : 'rec2-mobile';
2819
+ } else {
2820
+ setMobileView(false);
2821
+ adTargeting['pos'] = pos && pos.length ? pos : 'rec2';
2822
+ }
2823
+ }, [adTargeting, pos]);
2824
+
2825
+ var browserSizes = [[300, 250], [300, 600], [300, 100]];
2826
+ var mobileSizes = [[300, 50][(50)], [300, 250], [300, 100]];
2827
+
2828
+ return React__default.createElement(AdSlot.DFPAdSlot, { networkID: networkID, adUnit: adUnit, className: 'AD300x250', slotId: slotId, targeting: adTargeting, sizes: mobileView ? mobileSizes : browserSizes });
2791
2829
  };
2792
2830
 
2793
2831
  var ADFooter = function ADFooter(_ref) {
@@ -2850,23 +2888,22 @@ var ADFloatingFooter = function ADFloatingFooter(_ref) {
2850
2888
  adUnit = floatingAd.adUnit,
2851
2889
  _floatingAd$targeting = floatingAd.targeting,
2852
2890
  targeting = _floatingAd$targeting === undefined ? {} : _floatingAd$targeting,
2853
- position = floatingAd.position,
2891
+ _floatingAd$position = floatingAd.position,
2892
+ position = _floatingAd$position === undefined ? 'float' : _floatingAd$position,
2854
2893
  networkID = floatingAd.networkID,
2855
2894
  sizes = floatingAd.sizes;
2856
2895
 
2857
- var _useState = React.useState(false),
2896
+ var adt = _extends$2._extends({}, targeting, { pos: position });
2897
+
2898
+ var _useState = React.useState(adt),
2858
2899
  _useState2 = slicedToArray._slicedToArray(_useState, 2),
2859
- showAd = _useState2[0],
2860
- setShowAd = _useState2[1];
2900
+ adTargeting = _useState2[0],
2901
+ setTargeting = _useState2[1];
2861
2902
 
2862
- var adTargeting = void 0;
2863
- if (position && position.length > 0) {
2864
- adTargeting = {
2865
- content_placement: targeting.content_placement,
2866
- document_url: targeting.document_url,
2867
- pos: [position]
2868
- };
2869
- }
2903
+ var _useState3 = React.useState(false),
2904
+ _useState4 = slicedToArray._slicedToArray(_useState3, 2),
2905
+ showAd = _useState4[0],
2906
+ setShowAd = _useState4[1];
2870
2907
 
2871
2908
  React.useEffect(function () {
2872
2909
  if (window && window.innerWidth >= minScreenWidth) {
@@ -2906,23 +2943,23 @@ var ADGutter = function ADGutter(_ref) {
2906
2943
  adUnit = gutterAd.adUnit,
2907
2944
  _gutterAd$targeting = gutterAd.targeting,
2908
2945
  targeting = _gutterAd$targeting === undefined ? {} : _gutterAd$targeting,
2909
- position = gutterAd.position,
2946
+ _gutterAd$position = gutterAd.position,
2947
+ position = _gutterAd$position === undefined ? 'wallpaper' : _gutterAd$position,
2910
2948
  networkID = gutterAd.networkID,
2911
2949
  sizes = gutterAd.sizes;
2912
2950
 
2913
- var _useState = React.useState(false),
2951
+
2952
+ var adt = _extends$2._extends({}, targeting, { pos: position });
2953
+
2954
+ var _useState = React.useState(adt),
2914
2955
  _useState2 = slicedToArray._slicedToArray(_useState, 2),
2915
- showAd = _useState2[0],
2916
- setShowAd = _useState2[1];
2956
+ adTargeting = _useState2[0],
2957
+ setTargeting = _useState2[1];
2917
2958
 
2918
- var adTargeting = void 0;
2919
- if (position && position.length > 0) {
2920
- adTargeting = {
2921
- content_placement: targeting.content_placement,
2922
- document_url: targeting.document_url,
2923
- pos: [position]
2924
- };
2925
- }
2959
+ var _useState3 = React.useState(false),
2960
+ _useState4 = slicedToArray._slicedToArray(_useState3, 2),
2961
+ showAd = _useState4[0],
2962
+ setShowAd = _useState4[1];
2926
2963
 
2927
2964
  React.useEffect(function () {
2928
2965
  if (window && window.innerWidth >= minScreenWidth) {
@@ -2963,28 +3000,26 @@ var ADWelcome = function ADWelcome(_ref) {
2963
3000
  adUnit = welcomeAd.adUnit,
2964
3001
  _welcomeAd$targeting = welcomeAd.targeting,
2965
3002
  targeting = _welcomeAd$targeting === undefined ? {} : _welcomeAd$targeting,
2966
- position = welcomeAd.position,
3003
+ _welcomeAd$position = welcomeAd.position,
3004
+ position = _welcomeAd$position === undefined ? 'welcome' : _welcomeAd$position,
2967
3005
  networkID = welcomeAd.networkID,
2968
3006
  sizes = welcomeAd.sizes;
2969
3007
 
3008
+ var adt = _extends$2._extends({}, targeting, { pos: position });
2970
3009
 
2971
- var adTargeting = void 0;
2972
- if (position && position.length > 0) {
2973
- adTargeting = {
2974
- content_placement: targeting.content_placement,
2975
- document_url: targeting.document_url,
2976
- pos: [position]
2977
- };
2978
- }
3010
+ var _useState = React.useState(adt),
3011
+ _useState2 = slicedToArray._slicedToArray(_useState, 2),
3012
+ adTargeting = _useState2[0],
3013
+ setTargeting = _useState2[1];
2979
3014
 
2980
3015
  var calculateTimeLeft = function calculateTimeLeft(timeLeft) {
2981
3016
  return --timeLeft;
2982
3017
  };
2983
3018
 
2984
- var _useState = React.useState(calculateTimeLeft(counter)),
2985
- _useState2 = slicedToArray._slicedToArray(_useState, 2),
2986
- timeLeft = _useState2[0],
2987
- setTimeLeft = _useState2[1];
3019
+ var _useState3 = React.useState(calculateTimeLeft(counter)),
3020
+ _useState4 = slicedToArray._slicedToArray(_useState3, 2),
3021
+ timeLeft = _useState4[0],
3022
+ setTimeLeft = _useState4[1];
2988
3023
 
2989
3024
  React.useEffect(function () {
2990
3025
  if (timeLeft > 0) {
@@ -281,7 +281,7 @@ var DeckContent = function (_React$Component) {
281
281
  { className: 'brand-insight-wrapper', sm: 12, counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
282
282
  React__default.createElement(
283
283
  Card,
284
- { className: 'content-card ad-wrapper', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
284
+ { className: 'ad-wrapper', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
285
285
  React__default.createElement(
286
286
  'div',
287
287
  { style: { width: '100%', height: 'auto' } },
@@ -515,7 +515,7 @@ var GridContent = function (_React$Component) {
515
515
  { className: 'brand-insight-wrapper', counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
516
516
  React__default.createElement(
517
517
  Card,
518
- { className: 'content-card ad-wrapper', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
518
+ { className: 'ad-wrapper', style: { display: 'block !important', flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
519
519
  React__default.createElement(DFPAdSlot, { className: row.className, networkID: row.networkID, adUnit: row.adUnit, slotId: row.slotId, targeting: row.targeting, sizes: row.sizes })
520
520
  )
521
521
  )
@@ -25,4 +25,4 @@ import './slicedToArray-d0a9593a.js';
25
25
  import './AdSlot-5b019415.js';
26
26
  import './promise-683a9c54.js';
27
27
  import './get-b2201dc8.js';
28
- export { G as default } from './GridContent-7ec2de47.js';
28
+ export { G as default } from './GridContent-be36b0aa.js';
@@ -1,5 +1,6 @@
1
1
  import { c as createCommonjsModule, u as unwrapExports } from './_commonjsHelpers-0c4b6f40.js';
2
2
  import { m as main_36, c as main_37 } from './main-155ec04f.js';
3
+ import { _ as _extends } from './extends-dbbe308d.js';
3
4
  import React__default, { useState, useEffect, useRef } from 'react';
4
5
  import PropTypes from 'prop-types';
5
6
  import Container from 'react-bootstrap/Container';
@@ -2350,20 +2351,30 @@ var AD728x90 = function AD728x90(_ref) {
2350
2351
  adUnit = _ref.adUnit,
2351
2352
  slotId = _ref.slotId,
2352
2353
  _ref$targeting = _ref.targeting,
2353
- targeting = _ref$targeting === undefined ? {} : _ref$targeting;
2354
+ targeting = _ref$targeting === undefined ? {} : _ref$targeting,
2355
+ pos = _ref.pos;
2354
2356
 
2355
2357
  var _useState = useState(),
2356
2358
  _useState2 = _slicedToArray(_useState, 2),
2357
2359
  mobileView = _useState2[0],
2358
2360
  setMobileView = _useState2[1];
2359
2361
 
2362
+ var adt = _extends({}, targeting);
2363
+
2364
+ var _useState3 = useState(adt),
2365
+ _useState4 = _slicedToArray(_useState3, 2),
2366
+ adTargeting = _useState4[0],
2367
+ setTargeting = _useState4[1];
2368
+
2360
2369
  useEffect(function () {
2361
2370
  if (window && window.innerWidth && window.innerWidth < 768) {
2362
2371
  setMobileView(true);
2372
+ adTargeting['pos'] = pos && pos.length ? pos : 'top-mobile';
2363
2373
  } else {
2364
2374
  setMobileView(false);
2375
+ adTargeting['pos'] = pos && pos.length ? pos : 'top';
2365
2376
  }
2366
- }, []);
2377
+ }, [adTargeting, pos]);
2367
2378
 
2368
2379
  var browserSizes = [[728, 90], [970, 90], [320, 50], [300, 50]];
2369
2380
  var mobileSizes = [[320, 50], [300, 50]];
@@ -2372,7 +2383,7 @@ var AD728x90 = function AD728x90(_ref) {
2372
2383
  slotId: slotId,
2373
2384
  networkID: networkID,
2374
2385
  adUnit: adUnit,
2375
- targeting: targeting,
2386
+ targeting: adTargeting,
2376
2387
  className: 'AD728x90',
2377
2388
  sizes: mobileView ? mobileSizes : browserSizes,
2378
2389
  sizeMapping: [{
@@ -4,6 +4,7 @@ import './web.dom.iterable-3be50d6c.js';
4
4
  import './debounce-806f886b.js';
5
5
  import './main-155ec04f.js';
6
6
  import './core.get-iterator-method-31c1fb1a.js';
7
+ import './extends-dbbe308d.js';
7
8
  import 'react';
8
9
  import './index-fa84ea96.js';
9
10
  import 'prop-types';
@@ -18,7 +19,7 @@ import './get-b2201dc8.js';
18
19
  import 'react-bootstrap';
19
20
  import './index.esm-536609db.js';
20
21
  import 'react-bootstrap/Button';
21
- export { T as default } from './Normal-e86a38cf.js';
22
+ export { T as default } from './Normal-3822b5a3.js';
22
23
  import 'react-bootstrap/ListGroup';
23
24
  import 'next/head';
24
25
  import 'react-bootstrap/Nav';
package/dist/esm/index.js CHANGED
@@ -27,7 +27,7 @@ export { D as AdSlot, B as Beam } from './AdSlot-5b019415.js';
27
27
  import './promise-683a9c54.js';
28
28
  export { default as DeckContent } from './DeckContent.js';
29
29
  import './get-b2201dc8.js';
30
- export { A as AD, G as GridContent } from './GridContent-7ec2de47.js';
30
+ export { A as AD, G as GridContent } from './GridContent-be36b0aa.js';
31
31
  export { default as DeckQueue } from './DeckQueue.js';
32
32
  import 'react-bootstrap/Media';
33
33
  export { default as ThumbnailCard } from './ThumbnailCard.js';
@@ -48,8 +48,8 @@ export { default as IssueDeck } from './IssueDeck.js';
48
48
  import 'react-bootstrap/Badge';
49
49
  export { default as IssueContentDeck } from './IssueContentDeck.js';
50
50
  import Spinner from 'react-bootstrap/Spinner';
51
- import { M as MdPictureAsPdf, T as TemplateNormal } from './Normal-e86a38cf.js';
52
- export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-e86a38cf.js';
51
+ import { M as MdPictureAsPdf, T as TemplateNormal } from './Normal-3822b5a3.js';
52
+ export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-3822b5a3.js';
53
53
  import 'react-bootstrap/ListGroup';
54
54
  import Head from 'next/head';
55
55
  import Accordion from 'react-bootstrap/Accordion';
@@ -2759,16 +2759,35 @@ var AD300x250 = function AD300x250(_ref) {
2759
2759
  adUnit = _ref.adUnit,
2760
2760
  slotId = _ref.slotId,
2761
2761
  _ref$targeting = _ref.targeting,
2762
- targeting = _ref$targeting === undefined ? {} : _ref$targeting;
2763
-
2764
- return React__default.createElement(DFPAdSlot, {
2765
- networkID: networkID,
2766
- adUnit: adUnit,
2767
- slotId: slotId,
2768
- targeting: targeting,
2769
- className: 'AD300x250',
2770
- sizes: [[300, 250], [300, 100]]
2771
- });
2762
+ targeting = _ref$targeting === undefined ? {} : _ref$targeting,
2763
+ pos = _ref.pos;
2764
+
2765
+ var _useState = useState(),
2766
+ _useState2 = _slicedToArray(_useState, 2),
2767
+ mobileView = _useState2[0],
2768
+ setMobileView = _useState2[1];
2769
+
2770
+ var adt = _extends$2({}, targeting);
2771
+
2772
+ var _useState3 = useState(adt),
2773
+ _useState4 = _slicedToArray(_useState3, 2),
2774
+ adTargeting = _useState4[0],
2775
+ setTargeting = _useState4[1];
2776
+
2777
+ useEffect(function () {
2778
+ if (window && window.innerWidth && window.innerWidth < 768) {
2779
+ setMobileView(true);
2780
+ adTargeting['pos'] = pos && pos.length ? pos : 'rec1-mobile';
2781
+ } else {
2782
+ setMobileView(false);
2783
+ adTargeting['pos'] = pos && pos.length ? pos : 'rec1';
2784
+ }
2785
+ }, [adTargeting, pos]);
2786
+
2787
+ var browserSizes = [[300, 250], [300, 100]];
2788
+ var mobileSizes = [[300, 50][(50)], [300, 250], [300, 100]];
2789
+
2790
+ return React__default.createElement(DFPAdSlot, { networkID: networkID, adUnit: adUnit, slotId: slotId, targeting: adTargeting, className: 'AD300x250', sizes: mobileView ? mobileSizes : browserSizes });
2772
2791
  };
2773
2792
 
2774
2793
  var AD300x250x600 = function AD300x250x600(_ref) {
@@ -2776,16 +2795,35 @@ var AD300x250x600 = function AD300x250x600(_ref) {
2776
2795
  adUnit = _ref.adUnit,
2777
2796
  slotId = _ref.slotId,
2778
2797
  _ref$targeting = _ref.targeting,
2779
- targeting = _ref$targeting === undefined ? {} : _ref$targeting;
2780
-
2781
- return React__default.createElement(DFPAdSlot, {
2782
- networkID: networkID,
2783
- adUnit: adUnit,
2784
- className: 'AD300x250',
2785
- slotId: slotId,
2786
- targeting: targeting,
2787
- sizes: [[300, 250], [300, 600], [300, 100]]
2788
- });
2798
+ targeting = _ref$targeting === undefined ? {} : _ref$targeting,
2799
+ pos = _ref.pos;
2800
+
2801
+ var _useState = useState(),
2802
+ _useState2 = _slicedToArray(_useState, 2),
2803
+ mobileView = _useState2[0],
2804
+ setMobileView = _useState2[1];
2805
+
2806
+ var adt = _extends$2({}, targeting);
2807
+
2808
+ var _useState3 = useState(adt),
2809
+ _useState4 = _slicedToArray(_useState3, 2),
2810
+ adTargeting = _useState4[0],
2811
+ setTargeting = _useState4[1];
2812
+
2813
+ useEffect(function () {
2814
+ if (window && window.innerWidth && window.innerWidth < 768) {
2815
+ setMobileView(true);
2816
+ adTargeting['pos'] = pos && pos.length ? pos : 'rec2-mobile';
2817
+ } else {
2818
+ setMobileView(false);
2819
+ adTargeting['pos'] = pos && pos.length ? pos : 'rec2';
2820
+ }
2821
+ }, [adTargeting, pos]);
2822
+
2823
+ var browserSizes = [[300, 250], [300, 600], [300, 100]];
2824
+ var mobileSizes = [[300, 50][(50)], [300, 250], [300, 100]];
2825
+
2826
+ return React__default.createElement(DFPAdSlot, { networkID: networkID, adUnit: adUnit, className: 'AD300x250', slotId: slotId, targeting: adTargeting, sizes: mobileView ? mobileSizes : browserSizes });
2789
2827
  };
2790
2828
 
2791
2829
  var ADFooter = function ADFooter(_ref) {
@@ -2848,23 +2886,22 @@ var ADFloatingFooter = function ADFloatingFooter(_ref) {
2848
2886
  adUnit = floatingAd.adUnit,
2849
2887
  _floatingAd$targeting = floatingAd.targeting,
2850
2888
  targeting = _floatingAd$targeting === undefined ? {} : _floatingAd$targeting,
2851
- position = floatingAd.position,
2889
+ _floatingAd$position = floatingAd.position,
2890
+ position = _floatingAd$position === undefined ? 'float' : _floatingAd$position,
2852
2891
  networkID = floatingAd.networkID,
2853
2892
  sizes = floatingAd.sizes;
2854
2893
 
2855
- var _useState = useState(false),
2894
+ var adt = _extends$2({}, targeting, { pos: position });
2895
+
2896
+ var _useState = useState(adt),
2856
2897
  _useState2 = _slicedToArray(_useState, 2),
2857
- showAd = _useState2[0],
2858
- setShowAd = _useState2[1];
2898
+ adTargeting = _useState2[0],
2899
+ setTargeting = _useState2[1];
2859
2900
 
2860
- var adTargeting = void 0;
2861
- if (position && position.length > 0) {
2862
- adTargeting = {
2863
- content_placement: targeting.content_placement,
2864
- document_url: targeting.document_url,
2865
- pos: [position]
2866
- };
2867
- }
2901
+ var _useState3 = useState(false),
2902
+ _useState4 = _slicedToArray(_useState3, 2),
2903
+ showAd = _useState4[0],
2904
+ setShowAd = _useState4[1];
2868
2905
 
2869
2906
  useEffect(function () {
2870
2907
  if (window && window.innerWidth >= minScreenWidth) {
@@ -2904,23 +2941,23 @@ var ADGutter = function ADGutter(_ref) {
2904
2941
  adUnit = gutterAd.adUnit,
2905
2942
  _gutterAd$targeting = gutterAd.targeting,
2906
2943
  targeting = _gutterAd$targeting === undefined ? {} : _gutterAd$targeting,
2907
- position = gutterAd.position,
2944
+ _gutterAd$position = gutterAd.position,
2945
+ position = _gutterAd$position === undefined ? 'wallpaper' : _gutterAd$position,
2908
2946
  networkID = gutterAd.networkID,
2909
2947
  sizes = gutterAd.sizes;
2910
2948
 
2911
- var _useState = useState(false),
2949
+
2950
+ var adt = _extends$2({}, targeting, { pos: position });
2951
+
2952
+ var _useState = useState(adt),
2912
2953
  _useState2 = _slicedToArray(_useState, 2),
2913
- showAd = _useState2[0],
2914
- setShowAd = _useState2[1];
2954
+ adTargeting = _useState2[0],
2955
+ setTargeting = _useState2[1];
2915
2956
 
2916
- var adTargeting = void 0;
2917
- if (position && position.length > 0) {
2918
- adTargeting = {
2919
- content_placement: targeting.content_placement,
2920
- document_url: targeting.document_url,
2921
- pos: [position]
2922
- };
2923
- }
2957
+ var _useState3 = useState(false),
2958
+ _useState4 = _slicedToArray(_useState3, 2),
2959
+ showAd = _useState4[0],
2960
+ setShowAd = _useState4[1];
2924
2961
 
2925
2962
  useEffect(function () {
2926
2963
  if (window && window.innerWidth >= minScreenWidth) {
@@ -2961,28 +2998,26 @@ var ADWelcome = function ADWelcome(_ref) {
2961
2998
  adUnit = welcomeAd.adUnit,
2962
2999
  _welcomeAd$targeting = welcomeAd.targeting,
2963
3000
  targeting = _welcomeAd$targeting === undefined ? {} : _welcomeAd$targeting,
2964
- position = welcomeAd.position,
3001
+ _welcomeAd$position = welcomeAd.position,
3002
+ position = _welcomeAd$position === undefined ? 'welcome' : _welcomeAd$position,
2965
3003
  networkID = welcomeAd.networkID,
2966
3004
  sizes = welcomeAd.sizes;
2967
3005
 
3006
+ var adt = _extends$2({}, targeting, { pos: position });
2968
3007
 
2969
- var adTargeting = void 0;
2970
- if (position && position.length > 0) {
2971
- adTargeting = {
2972
- content_placement: targeting.content_placement,
2973
- document_url: targeting.document_url,
2974
- pos: [position]
2975
- };
2976
- }
3008
+ var _useState = useState(adt),
3009
+ _useState2 = _slicedToArray(_useState, 2),
3010
+ adTargeting = _useState2[0],
3011
+ setTargeting = _useState2[1];
2977
3012
 
2978
3013
  var calculateTimeLeft = function calculateTimeLeft(timeLeft) {
2979
3014
  return --timeLeft;
2980
3015
  };
2981
3016
 
2982
- var _useState = useState(calculateTimeLeft(counter)),
2983
- _useState2 = _slicedToArray(_useState, 2),
2984
- timeLeft = _useState2[0],
2985
- setTimeLeft = _useState2[1];
3017
+ var _useState3 = useState(calculateTimeLeft(counter)),
3018
+ _useState4 = _slicedToArray(_useState3, 2),
3019
+ timeLeft = _useState4[0],
3020
+ setTimeLeft = _useState4[1];
2986
3021
 
2987
3022
  useEffect(function () {
2988
3023
  if (timeLeft > 0) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.265",
3
+ "version": "1.0.266",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",