@mjhls/mjh-framework 1.0.512 → 1.0.514
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 +1 -1
- package/dist/cjs/QueueDeckExpanded.js +3 -3
- package/dist/cjs/View.js +19 -5
- package/dist/esm/QueueDeckExpanded.js +3 -3
- package/dist/esm/View.js +19 -5
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -345,7 +345,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
|
|
|
345
345
|
{
|
|
346
346
|
className: 'issueSection',
|
|
347
347
|
style: {
|
|
348
|
-
background: '#000000
|
|
348
|
+
background: '#000000',
|
|
349
349
|
color: '#ffffff',
|
|
350
350
|
marginBottom: '.25rem',
|
|
351
351
|
marginLeft: '.25rem',
|
|
@@ -446,7 +446,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
|
|
|
446
446
|
{
|
|
447
447
|
className: 'issueSection',
|
|
448
448
|
style: {
|
|
449
|
-
background: '#000000
|
|
449
|
+
background: '#000000',
|
|
450
450
|
color: '#ffffff',
|
|
451
451
|
marginBottom: '.25rem',
|
|
452
452
|
marginLeft: '.25rem',
|
|
@@ -560,7 +560,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
|
|
|
560
560
|
{
|
|
561
561
|
className: 'issueSection',
|
|
562
562
|
style: {
|
|
563
|
-
background: '#000000
|
|
563
|
+
background: '#000000',
|
|
564
564
|
color: '#ffffff',
|
|
565
565
|
marginBottom: '.25rem',
|
|
566
566
|
marginLeft: '.25rem',
|
package/dist/cjs/View.js
CHANGED
|
@@ -256,7 +256,8 @@ var Article = function Article(props) {
|
|
|
256
256
|
};
|
|
257
257
|
}();
|
|
258
258
|
|
|
259
|
-
var article = props.article
|
|
259
|
+
var article = props.article,
|
|
260
|
+
Ads = props.Ads;
|
|
260
261
|
var client = props.client,
|
|
261
262
|
pageview = props.pageview,
|
|
262
263
|
videoAccountIDs = props.videoAccountIDs,
|
|
@@ -292,8 +293,7 @@ var Article = function Article(props) {
|
|
|
292
293
|
lgContextAd = _props$lgContextAd === undefined ? false : _props$lgContextAd,
|
|
293
294
|
queueData = props.queueData,
|
|
294
295
|
_props$sponsoredFlag = props.sponsoredFlag,
|
|
295
|
-
sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag
|
|
296
|
-
Ads = props.Ads;
|
|
296
|
+
sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag;
|
|
297
297
|
var onChangeArticle = props.onChangeArticle;
|
|
298
298
|
|
|
299
299
|
//If sponsored flag, disable contextual ads
|
|
@@ -439,6 +439,7 @@ var Article = function Article(props) {
|
|
|
439
439
|
|
|
440
440
|
|
|
441
441
|
var indexes = findIndex(body);
|
|
442
|
+
|
|
442
443
|
if (indexes.length >= 2 && body.length > 3 && payload.contextualAD && payload.contextualVideoAD) {
|
|
443
444
|
payload = _extends._extends({}, payload, {
|
|
444
445
|
contextualAD: _extends._extends({}, payload.contextualAD, {
|
|
@@ -501,7 +502,8 @@ var Article = function Article(props) {
|
|
|
501
502
|
imageOptions: { w: 320, h: 240, fit: 'max' }
|
|
502
503
|
}, client.config()))
|
|
503
504
|
);
|
|
504
|
-
} else if (indexes.length >= 2 && body.length
|
|
505
|
+
} else if (indexes.length >= 2 && body.length >= 3 && payload.contextualAD && !payload.contextualVideoAD) {
|
|
506
|
+
|
|
505
507
|
payload = _extends._extends({}, payload, {
|
|
506
508
|
contextualAD: _extends._extends({}, payload.contextualAD, {
|
|
507
509
|
slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id,
|
|
@@ -1170,7 +1172,8 @@ var View = function View(props) {
|
|
|
1170
1172
|
article = props.article,
|
|
1171
1173
|
_props$sponsoredFlag = props.sponsoredFlag,
|
|
1172
1174
|
sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag,
|
|
1173
|
-
_props$sponsoredTaxon = props.sponsoredTaxonomies
|
|
1175
|
+
_props$sponsoredTaxon = props.sponsoredTaxonomies,
|
|
1176
|
+
Ads = props.Ads;
|
|
1174
1177
|
var _props$article = props.article,
|
|
1175
1178
|
_props$article$passwo = _props$article.passwordLock,
|
|
1176
1179
|
passwordLock = _props$article$passwo === undefined ? false : _props$article$passwo,
|
|
@@ -1203,6 +1206,17 @@ var View = function View(props) {
|
|
|
1203
1206
|
if (!needInfiniteScroll && !title) {
|
|
1204
1207
|
title = props.article ? props.article.title : '';
|
|
1205
1208
|
}
|
|
1209
|
+
//add mobile ads to articles not using infinite scroll
|
|
1210
|
+
if (!needInfiniteScroll) {
|
|
1211
|
+
var targeting = getTargeting.getTargeting(props);
|
|
1212
|
+
article.Ads = Ads.getRightItems(targeting);
|
|
1213
|
+
if (!sponsoredFlag && Ads.getVideoContextualAD) {
|
|
1214
|
+
article.contextualVideoAD = Ads.getVideoContextualAD(getTargeting.getTargeting(props, 'in-context_video'));
|
|
1215
|
+
}
|
|
1216
|
+
if (!sponsoredFlag && Ads.getNativeContextualAD) {
|
|
1217
|
+
article.contextualAD = Ads.getNativeContextualAD(getTargeting.getTargeting(props, 'native-ad'));
|
|
1218
|
+
}
|
|
1219
|
+
}
|
|
1206
1220
|
|
|
1207
1221
|
return React__default.createElement(
|
|
1208
1222
|
React__default.Fragment,
|
|
@@ -339,7 +339,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
|
|
|
339
339
|
{
|
|
340
340
|
className: 'issueSection',
|
|
341
341
|
style: {
|
|
342
|
-
background: '#000000
|
|
342
|
+
background: '#000000',
|
|
343
343
|
color: '#ffffff',
|
|
344
344
|
marginBottom: '.25rem',
|
|
345
345
|
marginLeft: '.25rem',
|
|
@@ -440,7 +440,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
|
|
|
440
440
|
{
|
|
441
441
|
className: 'issueSection',
|
|
442
442
|
style: {
|
|
443
|
-
background: '#000000
|
|
443
|
+
background: '#000000',
|
|
444
444
|
color: '#ffffff',
|
|
445
445
|
marginBottom: '.25rem',
|
|
446
446
|
marginLeft: '.25rem',
|
|
@@ -554,7 +554,7 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
|
|
|
554
554
|
{
|
|
555
555
|
className: 'issueSection',
|
|
556
556
|
style: {
|
|
557
|
-
background: '#000000
|
|
557
|
+
background: '#000000',
|
|
558
558
|
color: '#ffffff',
|
|
559
559
|
marginBottom: '.25rem',
|
|
560
560
|
marginLeft: '.25rem',
|
package/dist/esm/View.js
CHANGED
|
@@ -251,7 +251,8 @@ var Article = function Article(props) {
|
|
|
251
251
|
};
|
|
252
252
|
}();
|
|
253
253
|
|
|
254
|
-
var article = props.article
|
|
254
|
+
var article = props.article,
|
|
255
|
+
Ads = props.Ads;
|
|
255
256
|
var client = props.client,
|
|
256
257
|
pageview = props.pageview,
|
|
257
258
|
videoAccountIDs = props.videoAccountIDs,
|
|
@@ -287,8 +288,7 @@ var Article = function Article(props) {
|
|
|
287
288
|
lgContextAd = _props$lgContextAd === undefined ? false : _props$lgContextAd,
|
|
288
289
|
queueData = props.queueData,
|
|
289
290
|
_props$sponsoredFlag = props.sponsoredFlag,
|
|
290
|
-
sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag
|
|
291
|
-
Ads = props.Ads;
|
|
291
|
+
sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag;
|
|
292
292
|
var onChangeArticle = props.onChangeArticle;
|
|
293
293
|
|
|
294
294
|
//If sponsored flag, disable contextual ads
|
|
@@ -434,6 +434,7 @@ var Article = function Article(props) {
|
|
|
434
434
|
|
|
435
435
|
|
|
436
436
|
var indexes = findIndex(body);
|
|
437
|
+
|
|
437
438
|
if (indexes.length >= 2 && body.length > 3 && payload.contextualAD && payload.contextualVideoAD) {
|
|
438
439
|
payload = _extends({}, payload, {
|
|
439
440
|
contextualAD: _extends({}, payload.contextualAD, {
|
|
@@ -496,7 +497,8 @@ var Article = function Article(props) {
|
|
|
496
497
|
imageOptions: { w: 320, h: 240, fit: 'max' }
|
|
497
498
|
}, client.config()))
|
|
498
499
|
);
|
|
499
|
-
} else if (indexes.length >= 2 && body.length
|
|
500
|
+
} else if (indexes.length >= 2 && body.length >= 3 && payload.contextualAD && !payload.contextualVideoAD) {
|
|
501
|
+
|
|
500
502
|
payload = _extends({}, payload, {
|
|
501
503
|
contextualAD: _extends({}, payload.contextualAD, {
|
|
502
504
|
slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id,
|
|
@@ -1165,7 +1167,8 @@ var View = function View(props) {
|
|
|
1165
1167
|
article = props.article,
|
|
1166
1168
|
_props$sponsoredFlag = props.sponsoredFlag,
|
|
1167
1169
|
sponsoredFlag = _props$sponsoredFlag === undefined ? false : _props$sponsoredFlag,
|
|
1168
|
-
_props$sponsoredTaxon = props.sponsoredTaxonomies
|
|
1170
|
+
_props$sponsoredTaxon = props.sponsoredTaxonomies,
|
|
1171
|
+
Ads = props.Ads;
|
|
1169
1172
|
var _props$article = props.article,
|
|
1170
1173
|
_props$article$passwo = _props$article.passwordLock,
|
|
1171
1174
|
passwordLock = _props$article$passwo === undefined ? false : _props$article$passwo,
|
|
@@ -1198,6 +1201,17 @@ var View = function View(props) {
|
|
|
1198
1201
|
if (!needInfiniteScroll && !title) {
|
|
1199
1202
|
title = props.article ? props.article.title : '';
|
|
1200
1203
|
}
|
|
1204
|
+
//add mobile ads to articles not using infinite scroll
|
|
1205
|
+
if (!needInfiniteScroll) {
|
|
1206
|
+
var targeting = getTargeting(props);
|
|
1207
|
+
article.Ads = Ads.getRightItems(targeting);
|
|
1208
|
+
if (!sponsoredFlag && Ads.getVideoContextualAD) {
|
|
1209
|
+
article.contextualVideoAD = Ads.getVideoContextualAD(getTargeting(props, 'in-context_video'));
|
|
1210
|
+
}
|
|
1211
|
+
if (!sponsoredFlag && Ads.getNativeContextualAD) {
|
|
1212
|
+
article.contextualAD = Ads.getNativeContextualAD(getTargeting(props, 'native-ad'));
|
|
1213
|
+
}
|
|
1214
|
+
}
|
|
1201
1215
|
|
|
1202
1216
|
return React__default.createElement(
|
|
1203
1217
|
React__default.Fragment,
|