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.

Sign up for GitHub

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

Jump to bottom

Rad 2626 override set keywords #3448

Merged
merged 11 commits into from
Jan 15, 2019
Merged

Rad 2626 override set keywords #3448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cf72032
3413-Insert Iframes for user sync in body
Jan 3, 2019
c06f2f7
Merge master
Jan 3, 2019
e9cb1fa
Append Iframe as the last child
Jan 3, 2019
67b8057
Add unit test for insertElement
Jan 3, 2019
0a34de5
utls insert element at the top by default
Jan 4, 2019
08441a1
add unit tests for utls insert element
Jan 4, 2019
84cfbd5
Insert iframe as html last child
Jan 4, 2019
b7f250d
Merge branch 'master' into 3413-Insert-Iframe-in-body
Jan 8, 2019
29fe783
revert package.lock changes
Jan 8, 2019
d4ed31f
Override keywords in setTargetingForAst
Jan 14, 2019
230ec71
Merge branch 'master' into RAD-2626-override-setKeywords
Jan 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/targeting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export function newTargeting(auctionManager) {
// pt${n} keys should not be uppercased
keywordsObj[key] = astTargeting[targetId][key];
}
window.apntag.setKeywords(targetId, keywordsObj);
window.apntag.setKeywords(targetId, keywordsObj, { overrideKeyValue: true });
}
})
);
Expand Down
22 changes: 17 additions & 5 deletions test/spec/unit/pbjs_api_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,18 +135,30 @@ var createTagAST = function() {
window.apntag = {
keywords: [],
tags: createTagAST(),
setKeywords: function(key, params) {
setKeywords: function(key, params, options) {
var self = this;
if (!self.tags.hasOwnProperty(key)) {
return;
}
self.tags[key].keywords = this.tags[key].keywords || {};

utils._each(params, function(param, id) {
if (!self.tags[key].keywords.hasOwnProperty(id)) { self.tags[key].keywords[id] = param; } else if (!utils.isArray(self.tags[key].keywords[id])) { self.tags[key].keywords[id] = [self.tags[key].keywords[id]].concat(param); } else { self.tags[key].keywords[id] = self.tags[key].keywords[id].concat(param); }
});
if (typeof options === 'object' && options !== null && options.overrideKeyValue === true) {
utils._each(params, function(param, id) {
self.tags[key].keywords[id] = param;
});
} else {
utils._each(params, function (param, id) {
if (!self.tags[key].keywords.hasOwnProperty(id)) {
self.tags[key].keywords[id] = param;
} else if (!utils.isArray(self.tags[key].keywords[id])) {
self.tags[key].keywords[id] = [self.tags[key].keywords[id]].concat(param);
} else {
self.tags[key].keywords[id] = self.tags[key].keywords[id].concat(param);
}
})
}
}
};
}

describe('Unit: Prebid Module', function () {
let bidExpiryStub;
Expand Down