Skip to content

Commit

Permalink
disable flash checks to allow travis build to complete (prebid#2833)
Browse files Browse the repository at this point in the history
  • Loading branch information
jsnellbaker authored and AlessandroDG committed Sep 13, 2018
1 parent 3a87d45 commit e5fc0fe
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions modules/tripleliftBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const tripleliftAdapterSpec = {

tlCall = utils.tryAppendQueryString(tlCall, 'lib', 'prebid');
tlCall = utils.tryAppendQueryString(tlCall, 'v', '$prebid.version$');
tlCall = utils.tryAppendQueryString(tlCall, 'fe', _isFlashEnabled().toString());
// tlCall = utils.tryAppendQueryString(tlCall, 'fe', _isFlashEnabled().toString());
tlCall = utils.tryAppendQueryString(tlCall, 'referrer', referrer);

if (bidderRequest && bidderRequest.timeout) {
Expand Down Expand Up @@ -125,16 +125,16 @@ function _buildResponseObject(bidderRequest, bid) {
return bidResponse;
}

function _isFlashEnabled() {
let flash;
try {
flash = Boolean(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'));
} catch (e) {
flash = navigator.mimeTypes &&
navigator.mimeTypes['application/x-shockwave-flash'] !== undefined &&
navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin ? 1 : 0
}
return flash ? 1 : 0;
}
// function _isFlashEnabled() {
// let flash;
// try {
// flash = Boolean(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'));
// } catch (e) {
// flash = navigator.mimeTypes &&
// navigator.mimeTypes['application/x-shockwave-flash'] !== undefined &&
// navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin ? 1 : 0
// }
// return flash ? 1 : 0;
// }

registerBidder(tripleliftAdapterSpec);
2 changes: 1 addition & 1 deletion test/spec/modules/tripleliftBidAdapter_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ describe('triplelift adapter', () => {
expect(url).to.match(/(?:tlx.3lift.com\/header\/auction)/)
expect(url).to.match(/(?:lib=prebid)/)
expect(url).to.match(/(?:prebid.version)/)
expect(url).to.match(/(?:fe=)/)
// expect(url).to.match(/(?:fe=)/) //
expect(url).to.match(/(?:referrer)/)
})
});
Expand Down

0 comments on commit e5fc0fe

Please sign in to comment.