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

Update NasmediaAdmixer adapter #2164

Merged
merged 9 commits into from
Feb 22, 2018
Merged

Update NasmediaAdmixer adapter #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
27872b3
add NasmediaAdmixer adapter for Perbid.js 1.0
cykimh Dec 5, 2017
54f39fb
add NasmediaAdmixer adapter for Perbid.js 1.0
cykimh Dec 5, 2017
d065e82
add NasmediaAdmixer adapter for Perbid.js 1.0
cykimh Dec 7, 2017
58f4cc5
add NasmediaAdmixer adapter for Perbid.js 1.0
cykimh Dec 7, 2017
57e2df6
add NasmediaAdmixer adapter for Perbid.js 1.0
cykimh Dec 7, 2017
2c26f4a
add NasmediaAdmixer adapter for Perbid.js 1.0
cykimh Dec 15, 2017
aee55d4
Merge remote-tracking branch 'upstream/master'
cykimh Feb 19, 2018
ef96108
update NasmediaAdmixer adapter
cykimh Feb 19, 2018
7a49b63
update NasmediaAdmixer adapter
cykimh Feb 19, 2018
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
10 changes: 5 additions & 5 deletions modules/nasmediaAdmixerBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ export const spec = {

function getOsType() {
let ua = navigator.userAgent.toLowerCase();
let os = ['android', 'ios', 'mac', 'linux', 'window', 'etc'];
let regexp_os = [/android/i, /iphone|ipad/i, /mac/i, /linux/i, /window/i, ''];
let os = ['android', 'ios', 'mac', 'linux', 'window'];
let regexp_os = [/android/i, /iphone|ipad/i, /mac/i, /linux/i, /window/i];

return regexp_os.some((tos, idx) => {
if (ua.match(tos)) {
return os.find((tos, idx) => {
if (ua.match(regexp_os[idx])) {
return os[idx];
}
});
}) || 'etc';
}

function getSize(sizes) {
Expand Down
2 changes: 1 addition & 1 deletion modules/nasmediaAdmixerBidAdapter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Overview

```
Module Name: NasmeidaAdmixer Bidder Adapter
Module Name: NasmediaAdmixer Bidder Adapter
Module Type: Bidder Adapter
Maintainer: [email protected]
```
Expand Down