Merge pull request prebid#10 from PubMatic-OpenWrap/DynamicNamespace

Merging DynamicNamespace branch into
pm-abhinav-sinha · Dec 13, 2017 · e741527 · e741527
2 parents dac1582 + c52ad07
commit e741527
Show file tree

Hide file tree

Showing 70 changed files with 1,481 additions and 1,271 deletions.
diff --git a/modules.json b/modules.json
@@ -0,0 +1,10 @@
+[
+	"appnexusBidAdapter",	
+	"sekindoUMBidAdapter",
+	"pulsepointBidAdapter",		
+	"audienceNetworkBidAdapter",		
+	"openxBidAdapter",  
+	"rubiconBidAdapter",
+	"sovrnBidAdapter",
+	"pubmaticBidAdapter"
+]
diff --git a/modules/aardvarkBidAdapter.js b/modules/aardvarkBidAdapter.js
@@ -50,7 +50,7 @@ function requestBids(bidderCode, callbackName, bidReqs) {
 
   adloader.loadScript([
     '//' + endpoint + '/', ai, '/', scs.join('_'),
-    '/aardvark/?jsonp=$$PREBID_GLOBAL$$.', callbackName,
+    '/aardvark/?jsonp=' + preBidNameSpace + '.', callbackName,
     '&rtkreferer=', ref, '&', bidIds.join('&')
   ].join(''));
 }

diff --git a/modules/adbladeBidAdapter.js b/modules/adbladeBidAdapter.js
@@ -76,7 +76,7 @@ var AdbladeAdapter = function AdbladeAdapter() {
           utils.tryAppendQueryString(
             BASE_URI,
             'callback',
-            '$$PREBID_GLOBAL$$.adbladeResponse'
+            preBidNameSpace + '.adbladeResponse'
           ),
           'json',
           JSON.stringify(

diff --git a/modules/adbundBidAdapter.js b/modules/adbundBidAdapter.js
@@ -48,7 +48,7 @@ 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));
   }

diff --git a/modules/adformBidAdapter.js b/modules/adformBidAdapter.js
@@ -16,7 +16,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];

diff --git a/modules/admediaBidAdapter.js b/modules/admediaBidAdapter.js
@@ -58,7 +58,7 @@ var AdmediaAdapter = function AdmediaAdapter() {
       request_obj.siteRef = document.referrer;
       request_obj.topUrl = utils.getTopWindowUrl();
 
-      request_obj.callback = '$$PREBID_GLOBAL$$';
+      request_obj.callback = preBidNameSpace;
       request_obj.callbackId = bid.bidId;
 
       var endpoint = bidderUrl + utils.parseQueryStringParameters(request_obj);