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.

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

Add flash detection to TripleLift adapter #855

Merged
merged 3 commits into from
Jan 19, 2017
Merged

Conversation

tiffwu
Copy link
Contributor

@tiffwu tiffwu commented Dec 5, 2016

Type of change

  • Bugfix
  • Feature
  • New bidder adapter
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Other

Description of change

Adding a check for Flash support.

@protonate
Copy link
Collaborator

@tiffwu please resolve conflicts and we'll assign for review.

@tiffwu
Copy link
Contributor Author

tiffwu commented Dec 13, 2016

Hi @protonate -- by conflicts do you mean the test that failed? The error logged was:

line 79 col 20 'ActiveXObject' is not defined.

^ this object exists in IE, and the line is wrapped in a try/catch block which then proceeds to check for Flash support in non-IE browsers.

@mkendall07
Copy link
Member

@tiffwu
No, conflict in git for the source. Please resolve the conflict so it can be merged.

To fix the build error you need to preface ActiveXObject with window so jshint doesn't think it's undefined (it's a linting failure). IE new window.ActiveXObject

@mkendall07 mkendall07 self-assigned this Jan 6, 2017
@tiffwu
Copy link
Contributor Author

tiffwu commented Jan 17, 2017

@mkendall07 Thank you. Fixed!

@mkendall07
Copy link
Member

LGTM.

@mkendall07 mkendall07 merged commit 77ecc50 into prebid:master Jan 19, 2017
@tiffwu tiffwu deleted the adapter branch January 19, 2017 16:40
Walexander pushed a commit to MbidIO/Prebid.js that referenced this pull request Mar 6, 2017
* add flash detection to TripleLift adapter

* add window
mp-12301 pushed a commit to aol/Prebid.js that referenced this pull request Apr 10, 2017
…ebid-official-0.18.0 to release/1.13.0

* commit 'e145489bc5dd6d292cf16e7fe80adfdf991562ac': (27 commits)
  Add changelog entry.
  Prebid 0.18.0 Release
  Add Criteo adapter (prebid#928)
  add an event that fires when requestBids is called (prebid#939)
  Xaxis adapter submitted by Daniel hoffmann (prebid#938)
  Add flash detection to TripleLift adapter (prebid#855)
  OpenX Adapter: Fixed bug regarding cross-domain iframe support (prebid#931)
  Emit event when setTargetingForGPTAsync is called (prebid#873)
  Maintenance/refactor hb deal (prebid#935)
  Reset hb_* keys only for registered aduniits (prebid#934)
  update code style - smartyads adapter
  Catch errors in bidsBackHandler.  Also fix test cleanup in pbjs api spec. (prebid#905)
  Smartyads Adapter (prebid#895)
  Appnexus targeting function (prebid#920)
  There are 2 changes- (prebid#913)
  Adding support for all AST parameters (prebid#923)
  GumGum adapter - include the bid timeout as `tmax` (prebid#908)
  Add pixel size (prebid#892)
  enable postMessage listener for cross-domain iframe support (prebid#885)
  Add Sharethrough adapter (prebid#865)
  ...
mp-12301 pushed a commit to aol/Prebid.js that referenced this pull request Apr 10, 2017
…13.0 to master

* commit '7d32ed18c8636d9241ef8b299b6abd885536db69': (27 commits)
  Add changelog entry.
  Prebid 0.18.0 Release
  Add Criteo adapter (prebid#928)
  add an event that fires when requestBids is called (prebid#939)
  Xaxis adapter submitted by Daniel hoffmann (prebid#938)
  Add flash detection to TripleLift adapter (prebid#855)
  OpenX Adapter: Fixed bug regarding cross-domain iframe support (prebid#931)
  Emit event when setTargetingForGPTAsync is called (prebid#873)
  Maintenance/refactor hb deal (prebid#935)
  Reset hb_* keys only for registered aduniits (prebid#934)
  update code style - smartyads adapter
  Catch errors in bidsBackHandler.  Also fix test cleanup in pbjs api spec. (prebid#905)
  Smartyads Adapter (prebid#895)
  Appnexus targeting function (prebid#920)
  There are 2 changes- (prebid#913)
  Adding support for all AST parameters (prebid#923)
  GumGum adapter - include the bid timeout as `tmax` (prebid#908)
  Add pixel size (prebid#892)
  enable postMessage listener for cross-domain iframe support (prebid#885)
  Add Sharethrough adapter (prebid#865)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants