Skip to content
This repository was archived by the owner on Feb 13, 2021. It is now read-only.

Commit c0b731f

Browse files
author
Pereira, Marcio
committed
Merge pull request prebid#58 in AOLP_ADS_JS/prebid.js from release/1.8.0 to master
* commit '997aa5bce17aafd6b215d335551e89757f92bf3e': (37 commits) CHANGELOG. CHANGELOG Add new adapters for AOL analytics. Prebid 0.15.2 Release Fix issue with building prebid from npm install. Babel loader was being skipped because of the project residing in /node_modules/ directory. (prebid#820) Increment pre version Prebid 0.15.1 Release Update bidFloor->bidfloor to match other bidders + updated conversant docs (prebid#818) Correct 'bidloor' typo in Conversant adapter (prebid#815) Increment pre version 0.15.0 release support IE userLanguage Navigator property (prebid#807) exclude node_modules from babel-loader as to prevent strict mode errors (prebid#806) PulsePoint Adapter - Support for additional parameters. (prebid#784) Fix 'skippable' targeting typo (prebid#804) Adding adKernel adapter (prebid#739) Babel plugin fixes to make the generated code syntax valid in ie8 (prebid#799) Vertoz Adapter (prebid#789) RubiconLite is now just Rubicon and "rubicon" aliases "rubiconLite" (prebid#783) add version to global namespace (prebid#794) ...
2 parents a3ee191 + 997aa5b commit c0b731f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2656
-1535
lines changed

‎.babelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"presets": ["es2015"],
3-
"plugins": ["transform-object-assign"]
3+
"plugins": ["transform-object-assign", "transform-es3-property-literals", "transform-es3-member-expression-literals"]
44
}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ build
55
# Test Files
66
test/app
77
gpt.html
8+
gpt-mlane.html
89
gpt-each-bidder3.html
910

1011
# Selenium files

‎CHANGELOG‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
AOL Prebid 1.8.0
2+
----------------
3+
Updated to Prebid 0.15.2
4+
5+
16
AOL Prebid 1.7.0
27
----------------
38
Updated to Prebid 0.14.0

‎adapters.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
"adbutler",
55
"adequant",
66
"adform",
7+
"adkernel",
78
"admedia",
89
"aol",
910
"appnexus",
1011
"appnexusAst",
12+
"conversant",
1113
"getintent",
1214
"hiromedia",
1315
"indexExchange",
@@ -17,8 +19,8 @@
1719
"piximedia",
1820
"pubmatic",
1921
"pulsepoint",
22+
"rhythmone",
2023
"rubicon",
21-
"rubiconLite",
2224
"sonobi",
2325
"sovrn",
2426
"springserve",
@@ -32,6 +34,7 @@
3234
"memeglobal",
3335
"centro",
3436
"roxot",
37+
"vertoz",
3538
{
3639
"appnexus": {
3740
"alias": "brealtime"
@@ -51,5 +54,10 @@
5154
"appnexusAst": {
5255
"supportedMediaTypes": ["video"]
5356
}
57+
},
58+
{
59+
"rubicon": {
60+
"alias": "rubiconLite"
61+
}
5462
}
5563
]

‎integrationExamples/gpt/amp/amp_page.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,16 @@ <h1>Welcome to the mobile web</h1>
5555
height="250"
5656
layout="fixed"
5757
type="doubleclick"
58+
json='{"prebid":{"requestBidsDuration":1000,"adUnits":[{"code":"/19968336/header-bid-tag-1","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"4799418","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]},{"code":"/19968336/header-bid-tag-2","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"4799418","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]}]}}'
5859
data-slot="/19968336/header-bid-tag-1">
5960
</amp-ad>
6061

61-
<amp-ad
62+
<amp-ad
6263
width="300"
6364
height="250"
6465
layout="fixed"
6566
type="doubleclick"
67+
json='{"prebid":{"requestBidsDuration":1000,"adUnits":[{"code":"/19968336/header-bid-tag-1","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"4799418","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]},{"code":"/19968336/header-bid-tag-2","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"4799418","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]}]}}'
6668
data-slot="/19968336/header-bid-tag-2">
6769
</amp-ad>
6870

‎integrationExamples/gpt/amp/remote.html‎

Lines changed: 7 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -28,61 +28,8 @@
2828
// The Prebid global must match Prebid.js setting
2929
var $$PREBID_GLOBAL$$ = pbjs;
3030
var prebidSrc = 'https://publisher.com:9999/build/dev/prebid.js';
31-
var rightSlotSizes = [[300, 250], [300, 600], [300, 250], [100, 100]];
32-
var adUnits = [
33-
{
34-
code: '/19968336/header-bid-tag-1',
35-
sizes: rightSlotSizes,
36-
bids: [
37-
{
38-
bidder: 'appnexusAst',
39-
params: {
40-
placementId: '4799418',
41-
dealId: 'some deal!'
42-
}
43-
},
44-
{
45-
bidder: 'aol',
46-
params: {
47-
network: '10077.1',
48-
placement: 3671670
49-
}
50-
},
51-
{
52-
bidder: 'sovrn',
53-
params: {
54-
tagid: "315045"
55-
}
56-
}
57-
]
58-
},
59-
{
60-
code: '/19968336/header-bid-tag-2',
61-
sizes: rightSlotSizes,
62-
bids: [
63-
{
64-
bidder: 'appnexusAst',
65-
params: {
66-
placementId: '4799418',
67-
dealId: 'some deal!'
68-
}
69-
},
70-
{
71-
bidder: 'aol',
72-
params: {
73-
network: '10077.1',
74-
placement: 3671670
75-
}
76-
},
77-
{
78-
bidder: 'sovrn',
79-
params: {
80-
tagid: "315045"
81-
}
82-
}
83-
]
84-
}
85-
];
31+
var adUnits;
32+
var requestBidsDuration;
8633

8734
// load Prebid.js
8835
(function () {
@@ -95,7 +42,6 @@
9542

9643
var pbjs = pbjs || {};
9744
pbjs.que = pbjs.que || [];
98-
var PREBID_TIMEOUT = 3000;
9945

10046
var date = new Date().getTime();
10147

@@ -114,7 +60,7 @@
11460
initAdserver();
11561
console.log('bidsBackHandler responses: ', bidResponses);
11662
},
117-
timeout: 3000
63+
timeout: requestBidsDuration
11864
});
11965
});
12066
}
@@ -185,7 +131,10 @@
185131
if (typeof window.context.master.adCalls === 'undefined') {
186132
window.context.master.adCalls = [];
187133
}
188-
if (window.context && window.context.isMaster) {
134+
if (window.context && window.context.isMaster && config.prebid) {
135+
var prebid = config.prebid;
136+
adUnits = prebid.adUnits;
137+
requestBidsDuration = prebid.requestBidsDuration;
189138
loadPrebidJS();
190139
}
191140
window.context.master.adCalls.push(setTargeting.bind(null, config, done));

‎integrationExamples/gpt/pbjs_example_gpt.html‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,22 @@
208208
{
209209
bidder: 'adblade',
210210
params: {
211-
partnerId: 39875,
211+
partnerId: 42980,
212212
bidfloor: 0.01 // OPTIONAL float bid floor in $ CPM
213213
}
214+
},
215+
{
216+
bidder: 'vertoz',
217+
params:{
218+
placementId:'VZH123' //REQUIRED AD unit id
219+
}
220+
},
221+
{
222+
bidder: 'adkernel',
223+
params: {
224+
zoneId : '30164',
225+
host : 'cpm.metaadserving.com'
226+
}
214227
}
215228
]
216229
}, {

‎karma.conf.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ module.exports = function (config) {
6464
// test results reporter to use
6565
// possible values: 'dots', 'progress'
6666
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
67-
reporters: CI_MODE ? ['junit', 'coverage'] : ['progress', 'html', 'nyan', 'coverage'],
67+
reporters: CI_MODE ? ['junit', 'coverage'] : ['progress', 'html', 'coverage'],
6868

6969
// junit reporter config
7070
junitReporter: {
@@ -115,12 +115,11 @@ module.exports = function (config) {
115115
plugins: [
116116
'karma-browserstack-launcher',
117117
'karma-phantomjs-launcher',
118-
'karma-nyan-reporter',
119118
'karma-coverage',
120119
'karma-es5-shim',
121120
'karma-mocha',
122121
'karma-expect',
123-
'karma-sinon',
122+
'karma-sinon-ie',
124123
'karma-webpack',
125124
'karma-junit-reporter',
126125
'karma-html-reporter',

‎loaders/adapterLoader.js‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function insertAdapters() {
5656
return '/*!ADAPTER REGISTER DELIMITER*/' + inserts.map(name => {
5757

5858
return `var ${adapterName(name)} = require('./adapters/${name}.js');
59-
exports.registerBidAdapter(new ${adapterName(name)}${useCreateNew(name)}(), '${name}');\n`;
59+
exports.registerBidAdapter(new ${adapterName(name)}(), '${name}');\n`;
6060

6161
})
6262
.concat(customAdapters.map(adapter => {
@@ -90,15 +90,6 @@ function adapterName(adapter) {
9090
return '';
9191
}
9292

93-
/**
94-
* Some adapters export an object with a `createNew` constructor so accommodate this pattern
95-
* @param adapter
96-
* @returns {string}
97-
*/
98-
function useCreateNew(adapter) {
99-
return ['appnexus', 'appnexusAst'].includes(adapter) ? '.createNew' : '';
100-
}
101-
10293
/**
10394
* Filter an array to return unique values
10495
* @param value current array element value

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prebid.js",
3-
"version": "0.14.0",
3+
"version": "0.15.2",
44
"description": "Header Bidding Management Library",
55
"main": "src/prebid.js",
66
"scripts": {
@@ -28,6 +28,8 @@
2828
"babel-core": "^6.5.2",
2929
"babel-loader": "^6.2.3",
3030
"babel-plugin-transform-object-assign": "^6.8.0",
31+
"babel-plugin-transform-es3-property-literals": "^6.8.0",
32+
"babel-plugin-transform-es3-member-expression-literals": "^6.8.0",
3133
"babel-preset-es2015": "^6.5.0",
3234
"block-loader": "^2.1.0",
3335
"chai": "^3.3.0",
@@ -71,14 +73,13 @@
7173
"karma-ie-launcher": "^0.1.5",
7274
"karma-junit-reporter": "^0.3.8",
7375
"karma-mocha": "^0.2.0",
74-
"karma-nyan-reporter": "0.2.2",
7576
"karma-opera-launcher": "^0.1.0",
7677
"karma-phantomjs-launcher": "^0.2.1",
7778
"karma-requirejs": "^0.2.2",
7879
"karma-safari-launcher": "^0.1.1",
7980
"karma-sauce-launcher": "^0.2.10",
8081
"karma-script-launcher": "^0.1.0",
81-
"karma-sinon": "^1.0.4",
82+
"karma-sinon-ie": "^2.0.0-rc10",
8283
"karma-webpack": "^1.5.1",
8384
"localtunnel": "^1.3.0",
8485
"mkpath": "^1.0.0",

0 commit comments

Comments
 (0)