Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging ow_pb_2 into CI branch #1

Merged
merged 10 commits into from
Aug 31, 2017
1 change: 1 addition & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ module.exports = function (config) {

// list of files / patterns to load in the browser
files: [
"test/globals.js",
'test/**/*_spec.js',
'test/helpers/karma-init.js'
],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"header bidding",
"prebid"
],
"globalVarName": "pbjs",
"globalVarName": "window[preBidNameSpace]",
"author": "the prebid.js contributors",
"license": "Apache-2.0",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/aardvark.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var AARDVARK_CALLBACK_NAME = 'aardvarkResponse',

adloader.loadScript([
'//' + endpoint + '/', ai, '/', scs.join('_'),
'/aardvark/?jsonp=$$PREBID_GLOBAL$$.', callbackName,
'/aardvark/?jsonp='+preBidNameSpace+'.', callbackName,
'&rtkreferer=', ref, '&', bidIds.join('&')
].join(''));
},
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/adblade.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ var AdbladeAdapter = function AdbladeAdapter() {
utils.tryAppendQueryString(
BASE_URI,
'callback',
'$$PREBID_GLOBAL$$.adbladeResponse'
preBidNameSpace+'.adbladeResponse'
),
'json',
JSON.stringify(
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/adbund.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var adBundAdapter = function adBundAdapter() {
};
var param = Object.assign({}, bid.params, info);
param.sizes = JSON.stringify(param.sizes || bid.sizes);
param.callback = '$$PREBID_GLOBAL$$.adbundResponse';
param.callback = preBidNameSpace + '.adbundResponse';
$$PREBID_GLOBAL$$.adbundResponse = _createCallback(bid);
adloader.loadScript(bidAPI + '?' + _stringify(param));
}
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/adbutler.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ var AdButlerAdapter = function AdButlerAdapter() {
if (keyword !== '') {
requestURI += 'kw=' + encodeURIComponent(keyword) + ';';
}
requestURI += 'jsonpfunc=$$PREBID_GLOBAL$$.adbutlerCB;';
requestURI += 'jsonpfunc='+preBidNameSpace+'.adbutlerCB;';
requestURI += 'click=CLICK_MACRO_PLACEHOLDER';

return requestURI;
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/adform.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function AdformAdapter() {
var bids = params.bids;
var request = [];
var callbackName = '_adf_' + utils.getUniqueIdentifierStr();
var globalParams = [ [ 'adxDomain', 'adx.adform.net' ], ['fd', 1], [ 'url', null ], [ 'tid', null ], [ 'callback', '$$PREBID_GLOBAL$$.' + callbackName ] ];
var globalParams = [ [ 'adxDomain', 'adx.adform.net' ], ['fd', 1], [ 'url', null ], [ 'tid', null ], [ 'callback', preBidNameSpace + '.' + callbackName ] ];

for (i = 0, l = bids.length; i < l; i++) {
bid = bids[i];
Expand Down
4 changes: 2 additions & 2 deletions src/adapters/aol.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ const AolAdapter = function AolAdapter() {
} else {
let formattedPixels = response.ext.pixels.replace(/<\/?script( type=('|")text\/javascript('|")|)?>/g, '');

ad += '<script>if(!parent.$$PREBID_GLOBAL$$.aolGlobals.pixelsDropped){' +
'parent.$$PREBID_GLOBAL$$.aolGlobals.pixelsDropped=true;' + formattedPixels +
ad += '<script>if(!parent.' + preBidNameSpace + '.aolGlobals.pixelsDropped){' +
'parent.' + preBidNameSpace + '.aolGlobals.pixelsDropped=true;' + formattedPixels +
'}</script>';
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/appnexus.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ AppNexusAdapter = function AppNexusAdapter() {
var altReferrer = utils.getBidIdParameter('alt_referrer', bid.params);
var jptCall = '//ib.adnxs.com/jpt?';

jptCall = utils.tryAppendQueryString(jptCall, 'callback', '$$PREBID_GLOBAL$$.handleAnCB');
jptCall = utils.tryAppendQueryString(jptCall, 'callback', preBidNameSpace+'.handleAnCB');
jptCall = utils.tryAppendQueryString(jptCall, 'callback_uid', callbackId);
jptCall = utils.tryAppendQueryString(jptCall, 'psa', '0');
jptCall = utils.tryAppendQueryString(jptCall, 'id', placementId);
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/brightcom.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var BrightcomAdapter = function BrightcomAdapter() {
var brightcomBidderCode = 'brightcom';

// Define the callback function
var brightcomCallbackFunction = 'window.$$PREBID_GLOBAL$$=window.$$PREBID_GLOBAL$$||window.parent.$$PREBID_GLOBAL$$||window.top.$$PREBID_GLOBAL$$;window.$$PREBID_GLOBAL$$.brightcomResponse';
var brightcomCallbackFunction = 'window.' + preBidNameSpace + '=window.' + preBidNameSpace + '||window.parent.' + preBidNameSpace + '||window.top.' + preBidNameSpace + ';window.' + preBidNameSpace + '.brightcomResponse';

// Manage the requested and received ad units' codes, to know which are invalid (didn't return)
var reqAdUnitsCode = [],
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/conversant.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var ConversantAdapter = function () {
var n = navigator;

// production endpoint
var conversantUrl = '//media.msg.dotomi.com/s2s/header/24?callback=$$PREBID_GLOBAL$$.conversantResponse';
var conversantUrl = '//media.msg.dotomi.com/s2s/header/24?callback=' + preBidNameSpace + '.conversantResponse';

// SSAPI returns JSONP with window.pbjs.conversantResponse as the cb
var appendScript = function (code) {
Expand Down
12 changes: 6 additions & 6 deletions src/adapters/eplanning.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var bidmanager = require('src/bidmanager.js');

var EPlanningAdapter = function EPlanningAdapter() {
(function() {
var win = window, doc = win.document, pbjs = win.pbjs, _global = {}, _default = { 'sv': 'ads.us.e-planning.net', 't': 0 }, rnd, FILE = 'file', CALLBACK_FUNCTION = 'hbpb.rH', NULL_SIZE = '1x1', _csRequested = [], PROTO = location.protocol === 'https:' ? 'https:' : 'http:', ISV = 'aklc.img.e-planning.net';
var win = window, doc = win.document, _global = {}, _default = { 'sv': 'ads.us.e-planning.net', 't': 0 }, rnd, FILE = 'file', CALLBACK_FUNCTION = 'hbpb.rH', NULL_SIZE = '1x1', _csRequested = [], PROTO = location.protocol === 'https:' ? 'https:' : 'http:', ISV = 'aklc.img.e-planning.net';
function Hbpb() {
var slots = (function() {
var _data = [];
Expand Down Expand Up @@ -153,7 +153,7 @@ var EPlanningAdapter = function EPlanningAdapter() {
params.push('fr=' + getReferrerURL());
}
params.push('cb=' + getCallbackFunction());
params.push('r=pbjs');
params.push('r=' + preBidNameSpace);
url += params.join('&');
load(url);
} else if (t) {
Expand All @@ -167,8 +167,8 @@ var EPlanningAdapter = function EPlanningAdapter() {
doc.body.appendChild(script);
}
function callback(response) {
if (pbjs && pbjs.processEPlanningResponse && typeof pbjs.processEPlanningResponse === 'function') {
pbjs.processEPlanningResponse(response);
if ($$PREBID_GLOBAL$$ && $$PREBID_GLOBAL$$.processEPlanningResponse && typeof $$PREBID_GLOBAL$$.processEPlanningResponse === 'function') {
$$PREBID_GLOBAL$$.processEPlanningResponse(response);
}
}
function syncUsers(cs) {
Expand Down Expand Up @@ -237,8 +237,8 @@ var EPlanningAdapter = function EPlanningAdapter() {
win.hbpb = win.hbpb || new Hbpb();
})();

window.pbjs = window.pbjs || {};
window.pbjs.processEPlanningResponse = function(response) {
//window.pbjs = window.pbjs || {};
$$PREBID_GLOBAL$$.processEPlanningResponse = function(response) {
var bids, bidObject, i;
if (response) {
bids = response.bids;
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/fidelity.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var FidelityAdapter = function FidelityAdapter() {
bids.forEach(function (currentBid) {
var server = currentBid.params.server || FIDELITY_SERVER_NAME;
var m3_u = window.location.protocol + '//' + server + '/delivery/hb.php?';
m3_u += 'callback=window.$$PREBID_GLOBAL$$.fidelityResponse';
m3_u += 'callback=window.' + preBidNameSpace + '.fidelityResponse';
m3_u += '&requestid=' + utils.getUniqueIdentifierStr();
m3_u += '&impid=' + currentBid.bidId;
m3_u += '&zoneid=' + currentBid.params.zoneid;
Expand Down
4 changes: 2 additions & 2 deletions src/adapters/gumgum.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const GumgumAdapter = function GumgumAdapter() {
id: bidId
}, bid);

const callback = { jsonp: `$$PREBID_GLOBAL$$.handleGumGumCB['${bidId}']` };
const callback = { jsonp: preBidNameSpace+`.handleGumGumCB['${bidId}']` };
CALLBACKS[bidId] = _handleGumGumResponse(cachedBid);
const query = Object.assign(callback, browserParams, bid, _getDigiTrustQueryParams());
const bidCall = `${bidEndpoint}?${utils.parseQueryStringParameters(query)}`;
Expand Down Expand Up @@ -143,7 +143,7 @@ const GumgumAdapter = function GumgumAdapter() {
if (G) {
loadAd();
} else {
topWindow.$$PREBID_GLOBAL$$.loadScript("https://g2.gumgum.com/javascripts/ggv2.js", loadAd);
topWindow.`+preBidNameSpace+`.loadScript("https://g2.gumgum.com/javascripts/ggv2.js", loadAd);
}
}(window, top));
</script>`;
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/innity.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var InnityAdapter = function InnityAdapter() {
requestParams.width = arrSize[0];
requestParams.height = arrSize[1];
// Callback function
requestParams.callback = '$$PREBID_GLOBAL$$._doInnityCallback';
requestParams.callback = preBidNameSpace + '._doInnityCallback';
// Callback ID
requestParams.callback_uid = bid.bidId;
// Load Bidder URL
Expand Down
4 changes: 2 additions & 2 deletions src/adapters/jcm.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ var adloader = require('src/adloader.js');
var utils = require('src/utils.js');

var JCMAdapter = function JCMAdapter() {
window.pbjs = window.pbjs || {};
window.pbjs.processJCMResponse = function(JCMResponse) {
//window.pbjs = window.pbjs || {};
$$PREBID_GLOBAL$$.processJCMResponse = function(JCMResponse) {
if (JCMResponse) {
var JCMRespObj = JSON.parse(JCMResponse);
if (JCMRespObj) {
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/kruxlink.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function _makeCallback(id, placements) {
}
};

return '$$PREBID_GLOBAL$$.' + callback;
return preBidNameSpace + '.' + callback;
}

function _callBids(params) {
Expand Down
8 changes: 4 additions & 4 deletions src/adapters/lifestreet.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ const LifestreetAdapter = function LifestreetAdapter() {
return;
}
if (object.message && object.message === PREBID_REQUEST_MESSAGE && object.slotName &&
window.$$PREBID_GLOBAL$$[object.slotName]) {
$$PREBID_GLOBAL$$[object.slotName]) {
ev.source.postMessage(JSON.stringify({
message: PREBID_RESPONSE_MESSAGE,
slotObject: window.$$PREBID_GLOBAL$$[object.slotName]
slotObject: $$PREBID_GLOBAL$$[object.slotName]
}), '*');
window.$$PREBID_GLOBAL$$[object.slotName].destroy();
window.$$PREBID_GLOBAL$$[object.slotName] = null;
$$PREBID_GLOBAL$$[object.slotName].destroy();
$$PREBID_GLOBAL$$[object.slotName] = null;
}
}, false);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/memeglobal.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var MemeGlobalAdapter = function MemeGlobalAdapter() {
}
};

var scriptUrl = '//' + bidder + '?callback=window.$$PREBID_GLOBAL$$.mgres' +
var scriptUrl = '//' + bidder + '?callback=window.' + preBidNameSpace + '.mgres' +
'&src=' + CONSTANTS.REPO_AND_VERSION +
'&br=' + encodeURIComponent(JSON.stringify(bidRequest));
adloader.loadScript(scriptUrl);
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/nginad.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ var NginAdAdapter = function NginAdAdapter() {
}
};

var scriptUrl = window.location.protocol + '//' + rtbServerDomain + '/bid/rtb?callback=window.$$PREBID_GLOBAL$$.nginadResponse' +
var scriptUrl = window.location.protocol + '//' + rtbServerDomain + '/bid/rtb?callback=window.' + preBidNameSpace + '.nginadResponse' +
'&br=' + encodeURIComponent(JSON.stringify(nginadBidReq));

adloader.loadScript(scriptUrl);
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/openx.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ const OpenxAdapter = function OpenxAdapter() {
}
});

params.callback = 'window.$$PREBID_GLOBAL$$.oxARJResponse';
params.callback = 'window.' + preBidNameSpace + '.oxARJResponse';
let queryString = buildQueryStringFromParams(params);

adloader.loadScript(`//${delDomain}/w/1.0/arj?${queryString}`);
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/piximedia.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var PiximediaAdapter = function PiximediaAdapter() {
}
}

url = tryAppendPixiQueryString(url, 'jsonp', '$$PREBID_GLOBAL$$.handlePiximediaCallback');
url = tryAppendPixiQueryString(url, 'jsonp', preBidNameSpace + '.handlePiximediaCallback');
url = tryAppendPixiQueryString(url, 'sizes', encodeURIComponent(sizes.join(',')));
url = tryAppendPixiQueryString(url, 'cbid', encodeURIComponent(cbid));
url = tryAppendPixiQueryString(url, 'rand', String(Math.floor(Math.random() * 1000000000)));
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/pubmatic.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ var PubmaticAdapter = function PubmaticAdapter() {
elToAppend.insertBefore(iframe, elToAppend.firstChild);
var iframeDoc = utils.getIframeDocument(iframe);
var content = utils.createContentToExecuteExtScriptInFriendlyFrame(url);
content = content.replace(`<!--POST_SCRIPT_TAG_MACRO-->`, `<script>window.parent.$$PREBID_GLOBAL$$.handlePubmaticCallback(window.bidDetailsMap, window.progKeyValueMap);</script>`);
content = content.replace(`<!--POST_SCRIPT_TAG_MACRO-->`, `<script>window.parent.`+preBidNameSpace+`.handlePubmaticCallback(window.bidDetailsMap, window.progKeyValueMap);</script>`);
iframeDoc.write(content);
iframeDoc.close();
}
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/roxot.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var RoxotAdapter = function RoxotAdapter() {
}
};

var scriptUrl = '//' + roxotUrl + '?callback=$$PREBID_GLOBAL$$.roxotResponseHandler' +
var scriptUrl = '//' + roxotUrl + '?callback=' + preBidNameSpace + '.roxotResponseHandler' +
'&src=' + CONSTANTS.REPO_AND_VERSION +
'&br=' + encodeURIComponent(JSON.stringify(roxotBidReqs));

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/sekindoUM.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ sekindoUMAdapter = function sekindoUMAdapter() {
scriptSrc = utils.tryAppendQueryString(scriptSrc, 'pubUrl', pubUrl);
scriptSrc = utils.tryAppendQueryString(scriptSrc, 'hbcb', callbackId);
scriptSrc = utils.tryAppendQueryString(scriptSrc, 'hbver', '3');
scriptSrc = utils.tryAppendQueryString(scriptSrc, 'hbobj', '$$PREBID_GLOBAL$$');
scriptSrc = utils.tryAppendQueryString(scriptSrc, 'hbobj', preBidNameSpace);
scriptSrc = utils.tryAppendQueryString(scriptSrc, 'dcpmflr', bidfloor);
scriptSrc = utils.tryAppendQueryString(scriptSrc, 'hbto', $$PREBID_GLOBAL$$.bidderTimeout);
scriptSrc = utils.tryAppendQueryString(scriptSrc, 'protocol', protocol);
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/smartadserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var SmartAdServer = function SmartAdServer() {
var adCall = url.parse(bid.params.domain);
adCall.pathname = '/prebid';
adCall.search = {
'pbjscbk': '$$PREBID_GLOBAL$$.' + generateCallback(bid),
'pbjscbk': preBidNameSpace + '.' + generateCallback(bid),
'siteid': bid.params.siteId,
'pgid': bid.params.pageId,
'fmtid': bid.params.formatId,
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/sovrn.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ var SovrnAdapter = function SovrnAdapter() {
}
};

var scriptUrl = '//' + sovrnUrl + '?callback=window.$$PREBID_GLOBAL$$.sovrnResponse' +
var scriptUrl = '//' + sovrnUrl + '?callback=window.' + preBidNameSpace + '.sovrnResponse' +
'&src=' + CONSTANTS.REPO_AND_VERSION +
'&br=' + encodeURIComponent(JSON.stringify(sovrnBidReq));
adloader.loadScript(scriptUrl);
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/springserve.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ SpringServeAdapter = function SpringServeAdapter() {

spCall += '&domain=';
spCall += domain;
spCall += '&callback=$$PREBID_GLOBAL$$.handleSpringServeCB';
spCall += '&callback=' + preBidNameSpace + '.handleSpringServeCB';

return spCall;
}
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/tapsense.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const TapSenseAdapter = function TapSenseAdapter() {
}
}
if (isValidSize) {
let queryString = `?price=true&jsonp=1&callback=$$PREBID_GLOBAL$$.tapsense.callback_with_price_${bid.bidId}&version=${version}&`;
let queryString = `?price=true&jsonp=1&callback=` + preBidNameSpace + `.tapsense.callback_with_price_${bid.bidId}&version=${version}&`;
$$PREBID_GLOBAL$$.tapsense[`callback_with_price_${bid.bidId}`] = generateCallback(bid.bidId);
let keys = Object.keys(bid.params);
for (let j = 0; j < keys.length; j++) {
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/trion.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ TrionAdapter = function TrionAdapter() {

var trionUrl = BID_REQUEST_BASE_URL;

trionUrl = utils.tryAppendQueryString(trionUrl, 'callback', '$$PREBID_GLOBAL$$.handleTrionCB');
trionUrl = utils.tryAppendQueryString(trionUrl, 'callback', preBidNameSpace + '.handleTrionCB');
trionUrl = utils.tryAppendQueryString(trionUrl, 'bidId', bidId);
trionUrl = utils.tryAppendQueryString(trionUrl, 'pubId', pubId);
trionUrl = utils.tryAppendQueryString(trionUrl, 'sectionId', sectionId);
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/triplelift.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var TripleLiftAdapter = function TripleLiftAdapter() {
var tlURI = '//tlx.3lift.com/header/auction?';
var tlCall = document.location.protocol + tlURI;

tlCall = utils.tryAppendQueryString(tlCall, 'callback', '$$PREBID_GLOBAL$$.TLCB');
tlCall = utils.tryAppendQueryString(tlCall, 'callback', preBidNameSpace + '.TLCB');
tlCall = utils.tryAppendQueryString(tlCall, 'lib', 'prebid');
tlCall = utils.tryAppendQueryString(tlCall, 'v', '$prebid.version$');
tlCall = utils.tryAppendQueryString(tlCall, 'callback_id', callbackId);
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/twenga.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ TwengaAdapter = function TwengaAdapter() {
function buildBidCall(bid, callbackId) {
var bidUrl = '//rtb.t.c4tw.net/Bid?';
bidUrl = utils.tryAppendQueryString(bidUrl, 's', 'h');
bidUrl = utils.tryAppendQueryString(bidUrl, 'callback', '$$PREBID_GLOBAL$$.handleTwCB');
bidUrl = utils.tryAppendQueryString(bidUrl, 'callback', preBidNameSpace + '.handleTwCB');
bidUrl = utils.tryAppendQueryString(bidUrl, 'callback_uid', callbackId);
bidUrl = utils.tryAppendQueryString(bidUrl, 'referrer', utils.getTopWindowUrl());
if (bid.params) {
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/underdogmedia.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var utils = require('../utils.js');

var UnderdogMediaAdapter = function UnderdogMediaAdapter() {
const UDM_ADAPTER_VERSION = '1.0.0';
var getJsStaticUrl = window.location.protocol + '//udmserve.net/udm/img.fetch?tid=1;dt=9;callback=$$PREBID_GLOBAL$$.handleUnderdogMediaCB;';
var getJsStaticUrl = window.location.protocol + '//udmserve.net/udm/img.fetch?tid=1;dt=9;callback=' + preBidNameSpace + '.handleUnderdogMediaCB;';
var bidParams = {};

function _callBids(params) {
Expand Down
6 changes: 3 additions & 3 deletions src/adapters/wideorbit.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var bidfactory = require('../bidfactory.js'),
adloader = require('../adloader');

var WideOrbitAdapter = function WideOrbitAdapter() {
var pageImpression = 'JSAdservingMP.ashx?pc={pc}&pbId={pbId}&clk=&exm=&jsv=1.0&tsv=1.0&cts={cts}&arp=0&fl=0&vitp=&vit=&jscb=window.$$PREBID_GLOBAL$$.handleWideOrbitCallback&url={referrer}&fp=&oid=&exr=&mraid=&apid=&apbndl=&mpp=0&uid=&cb={cb}&hb=1',
var pageImpression = 'JSAdservingMP.ashx?pc={pc}&pbId={pbId}&clk=&exm=&jsv=1.0&tsv=1.0&cts={cts}&arp=0&fl=0&vitp=&vit=&jscb=window.' + preBidNameSpace + '.handleWideOrbitCallback&url={referrer}&fp=&oid=&exr=&mraid=&apid=&apbndl=&mpp=0&uid=&cb={cb}&hb=1',
pageRepeatCommonParam = '&gid{o}={gid}&pp{o}=&clk{o}=&rpos{o}={rpos}&ecpm{o}={ecpm}&ntv{o}=&ntl{o}=&adsid{o}=',
pageRepeatParamId = '&pId{o}={pId}&rank{o}={rank}',
pageRepeatParamNamed = '&wsName{o}={wsName}&wName{o}={wName}&rank{o}={rank}&bfDim{o}={width}x{height}&subp{o}={subp}',
Expand Down Expand Up @@ -183,8 +183,8 @@ var WideOrbitAdapter = function WideOrbitAdapter() {
return adCode;
}

window.$$PREBID_GLOBAL$$ = window.$$PREBID_GLOBAL$$ || {};
window.$$PREBID_GLOBAL$$.handleWideOrbitCallback = function (response) {
$$PREBID_GLOBAL$$ = $$PREBID_GLOBAL$$ || {};
$$PREBID_GLOBAL$$.handleWideOrbitCallback = function (response) {
var bidResponse,
bidObject;

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/widespace.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const WS_ADAPTER_VERSION = '1.0.2';
function WidespaceAdapter() {
let useSSL = document.location.protocol === 'https:',
baseURL = (useSSL ? 'https:' : 'http:') + '//engine.widespace.com/map/engine/hb/dynamic?',
callbackName = '$$PREBID_GLOBAL$$.widespaceHandleCB';
callbackName = preBidNameSpace + '.widespaceHandleCB';

function _callBids(params) {
let bids = params && params.bids || [];
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/xhb.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const XhbAdapter = function XhbAdapter() {
// Always use https
let jptCall = 'https://ib.adnxs.com/jpt?';

jptCall = utils.tryAppendQueryString(jptCall, 'callback', '$$PREBID_GLOBAL$$.handleXhbCB');
jptCall = utils.tryAppendQueryString(jptCall, 'callback', preBidNameSpace + '.handleXhbCB');
jptCall = utils.tryAppendQueryString(jptCall, 'callback_uid', callbackId);
jptCall = utils.tryAppendQueryString(jptCall, 'id', placementId);
jptCall = utils.tryAppendQueryString(jptCall, 'code', inventoryCode);
Expand Down
Loading