Skip to content

Commit b9fbe7a

Browse files
authored
Merge branch 'prebid:master' into master
2 parents 22635fb + 0e8f0c2 commit b9fbe7a

119 files changed

Lines changed: 3955 additions & 472 deletions

File tree

Some content is hidden

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

ADS - Acceso directo.lnk

885 Bytes
Binary file not shown.

_data/sidebar.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,14 @@
531531
sectionTitle:
532532
subgroup: 5
533533

534+
- sbSecId: 1
535+
title: Loading modules separately
536+
link: /dev-docs/modules/index.html#loading-modules-separately
537+
isHeader: 0
538+
isSectionHeader: 0
539+
sectionTitle:
540+
subgroup: 5
541+
534542
- sbSecId: 1
535543
title: External Interfaces
536544
link:

_includes/body-end.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script src="https://cdn.jsdelivr.net/npm/@docsearch/js@3"></script>
22
<script type="text/javascript"> docsearch({
3-
apiKey: '6f0eda209a805cfa66b415043ab5fbfc',
3+
apiKey: '7777b1f98e980527606d00e705ff3d6f',
44
appId: 'FN26QH8JE9',
55
indexName: 'prebid',
66
container: '.pb-header .c-search',

_includes/mobile/gam-native-adops.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1><a target="_blank" href="hb_native_linkurl" class="pb-click">hb_native_title
2020
<div class="attribution">hb_native_brand</div>
2121
</div>
2222
</div>
23-
<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/native-trk.js"></script>
23+
<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@%%PATTERN:hb_ver%%/dist/native-trk.js"></script>
2424
<script>
2525
var pbNativeTagData = {};
2626
pbNativeTagData.uuid = "%%PATTERN:hb_cache_id%%";

adops/adops-general-sbs.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ If your ad server supports targeting creatives within the line item, it could co
116116

117117
You’ve now added all fields required for targeting Prebid line items. You can add any other line item options you would normally use, such as additional targeting for geography. When you’ve filled in all the appropriate fields, save your line item.
118118

119+
<a id="create-creatives" ></a>
120+
119121
## Create Your Creatives
120122

121123
The process of creating your creatives will differ based on the type of creative.
@@ -131,7 +133,7 @@ We recommend using the [Prebid Universal Creative](/overview/prebid-universal-cr
131133
If you’re working with banner or in-renderer creatives, the HTML you’ll enter in the creatives will be similar to the following (utilizing whatever macro format is supported by your ad server):
132134

133135
```html
134-
<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/%%PATTERN:hb_format%%.js"></script>
136+
<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@%%PATTERN:hb_ver%%/dist/%%PATTERN:hb_format%%.js"></script>
135137
<script>
136138
var ucTagData = {};
137139
ucTagData.adServerDomain = "";
@@ -157,6 +159,7 @@ If you’re working with banner or in-renderer creatives, the HTML you’ll ente
157159
* Replace `%%MACRO%%` with the appropriate macro for your ad server. (Refer to your ad server’s documentation or consult with a representative for specific details regarding the proper macros and how to use them.)
158160
* Replace BIDDERCODE with the appropriate code for the bidder your line item is targeting. For example, if you’re targeting BidderA, the macro variable for adId might look like `ucTagData.adId = "%%PATTERN:hb_adid_BidderA%%";`.
159161
* If you're hosting your own Prebid Universal Creative, make sure it's version 1.15 or later, or replace `%%PATTERN:hb_format%%.js` with `creative.js`.
162+
* The `hb_ver` targeting key, used above to construct the Prebid Universal Creative CDN URL, requires Prebid.js 10.11.0 or later. If that's not available, substitute `%%PATTERN:hb_ver%%` with a particular PUC version.
160163

161164
The example above uses the jsdelvr CDN as the domain from which the creative will serve. However, you may obtain the creative from a managed service or host it yourself. You might need to edit the creative and make adjustments to your creative settings depending on the CDN you're using.
162165

adops/creative-considerations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ the actual PUC.
6666

6767
If you choose to use the Prebid Universal Creative, you'll need to decide where to load it from:
6868

69-
1. Prebid hosts an always-up-to-date copy of the PUC code at `https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/*`. The upside of this location is that it's automatically updated so it contains new features automatically. The potential downside is that Prebid controls when it's upgrades.
70-
1. You can host the PUC at your own location. The upside of this option is that you can control when upgrades happen.
69+
1. Prebid hosts each PUC version at `https://cdn.jsdelivr.net/npm/prebid-universal-creative@${VERSION}/dist/*` - substitute `${VERSION}` with a version number. Using Prebid.js 10.11.0 or later, you may also use the `hb_ver` targeting key; see [create your creatives](/adops/adops-general-sbs.html#create-your-creatives).
70+
1. You can host the PUC at your own location. The upside of this option is more control over when upgrades happen.
7171
1. You can copy the body of the PUC into your ad server creative directly. This eliminates a browser fetch, but could make upgrades more difficult.
7272

7373
### Prebid.js 'dynamic creatives'
@@ -115,7 +115,7 @@ VAST URL required. See the [GAM Prebid Mobile Rendering Ad Ops](/adops/mobile-re
115115
{: .table .table-bordered }
116116
| :memo: Use Cases |
117117
|:---------------------------|
118-
| - Prbeid.js Native |
118+
| - Prebid.js Native |
119119

120120
Native ads require close collaboration between web designers, engineering, and ad ops. The primary decision to be made that affects ad ops is where to store the rendering template. The options are:
121121

adops/gam-creative-banner-sbs.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,18 @@ These instructions assume you're using the Prebid Universal Creative (PUC) after
5656
{: .alert.alert-warning :}
5757
Be sure to replace BIDDERCODE with the appropriate bidder. For example, if the bidder code is `PBbidder`, the `adid` would be `%%PATTERN:hb_adid_PBbidder%%`.
5858

59-
Also, replace "PUCFILE" with:
59+
Replace "PUCFILE" with:
6060

6161
- Prebid.js: "%%PATTERN:hb_format%%.js"
6262
- Prebid Mobile: "creative.js"
6363

64+
Replace "VERSION" with:
65+
66+
- Prebid.js 10.11.0 or later: "%%PATTERN:hb_ver%%"
67+
- Otherwise, a specific PUC version.
68+
6469
```html
65-
<script src = "https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/PUCFILE"></script>
70+
<script src = "https://cdn.jsdelivr.net/npm/prebid-universal-creative@VERSION/dist/PUCFILE"></script>
6671
<script>
6772
var ucTagData = {};
6873
ucTagData.adServerDomain = "";
@@ -99,13 +104,18 @@ Warning: Be sure none of the attribute names are longer than 20 characters. See
99104

100105
In top-price mode, you can make use of the GAM `TARGETINGMAP` feature instead of listing out each attribute.
101106

102-
Be sure to replace "PUCFILE" with:
107+
Replace "PUCFILE" with:
103108

104109
- Prebid.js: "%%PATTERN:hb_format%%.js"
105110
- Prebid Mobile: "creative.js"
106111

112+
Replace "VERSION" with:
113+
114+
- Prebid.js 10.11.0 or later: "%%PATTERN:hb_ver%%"
115+
- Otherwise, a specific PUC version.
116+
107117
```html
108-
<script src = "https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/PUCFILE"></script>
118+
<script src = "https://cdn.jsdelivr.net/npm/prebid-universal-creative@VERSION/dist/PUCFILE"></script>
109119
<script>
110120
var ucTagData = {};
111121
ucTagData.adServerDomain = "";

adops/gam-native.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Example creative HTML:
104104
<div class="attribution">##hb_native_brand##</div>
105105
</div>
106106
</div>
107-
<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/%%PATTERN:hb_format%%.js"></script>
107+
<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@%%PATTERN:hb_ver%%/dist/%%PATTERN:hb_format%%.js"></script>
108108
<script>
109109
var pbNativeTagData = {};
110110
pbNativeTagData.pubUrl = "%%PATTERN:url%%";

adops/setting-up-prebid-with-the-appnexus-ad-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Follow the banner creative setup instructions in [Add Creatives](https://docs.xa
8080
* Self-Audit the creative and confirm compliance.
8181

8282
```html
83-
<script src = "https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/#{HB_FORMAT}.js"></script>
83+
<script src = "https://cdn.jsdelivr.net/npm/prebid-universal-creative@#{HB_VER}/dist/#{HB_FORMAT}.js"></script>
8484
<script>
8585
var ucTagData = {};
8686
ucTagData.adServerDomain = window.location.host;

assets/js/download.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
$('#download-button').html('<i class="glyphicon glyphicon-send"></i> Sending Request...').addClass('disabled');
8787

8888
var form_data = get_form_data();
89+
const removedModules = form_data.removedModules;
90+
delete form_data.removedModules;
8991
$.ajax({
9092
type: "POST",
9193
url: "https://js-download.prebid.org/download",
@@ -112,12 +114,12 @@
112114
triggerDownload(jsBlob, filename);
113115
triggerDownload(new Blob([configData], { type: "application/json" }), "prebid-config.json");
114116

115-
if (form_data["removedModules"].length > 0) {
117+
if (removedModules.length > 0) {
116118
alert(
117119
"The following modules were removed from your download because they aren't present in Prebid.js version " +
118120
form_data["version"] +
119121
": " +
120-
JSON.stringify(form_data["removedModules"])
122+
JSON.stringify(removedModules)
121123
);
122124
}
123125
})
@@ -179,7 +181,7 @@
179181
});
180182

181183
return {
182-
modules: renameModules(version, modules),
184+
modules: renameModules(version, modules).filter(mod => !removedModules.includes(mod)),
183185
version,
184186
removedModules,
185187
};

0 commit comments

Comments
 (0)