Commit Graph
178 Commits
Author SHA1 Message Date
David Taylor c88bb59d81 FIX: Fully re-render ads when navigating between pages (#188)
In the past, the ad plugin relied on two side-effects to achieve this behaviour:

1. Components being fully destroyed/rendered when navigating between pages. This stopped working when Discourse core moved to the more efficient 'loading slider' UI

2. The `listLoading` argument. This was an implementation detail of the old discovery routing infrastructure. Core recently overhauled this and removed the `listLoading` argument, because loading is now handled properly by the Ember router.

Instead of these two properties, we can use the `currentRoute` property of Ember's router service to trigger changes when navigating between pages. A common `{{#each` trick is used to fully destroy/re-render components even if the ad network is unchanged.
2023-11-07 21:12:30 +00:00
David Taylor 3828578d5d DEV: Restructure file locations
- Colocate components / connectors
- Move admin UI files to `admin/assets` so they are only served to admins
2023-11-07 18:37:39 +00:00
David Taylor 86ef7da2eb DEV: Apply eslint --fix 2023-11-07 18:14:12 +00:00
David Taylor c519b4bc92 DEV: Update eslint-config-discourse, use prettier for hbs (#163) 2023-01-04 13:34:08 +01:00
Roman Rizzi 4940d0ea19 FIX: Ensure we won't render the connector if there are no ads (#148) 2022-07-14 15:58:29 -03:00
Roman Rizzi d9b739f803 FIX: Don't render the connector when we shouldn't display an ad in the topic list item. (#146)
We expose the ad-slot logic to determine which ads are potentially available for each slot and don't render the connector when there are none. Leaking the component logic is not ideal, but I don't see a better solution given the
current design.
2022-07-12 16:13:18 -03:00
5901a52dbc FEATURE: support placing ads between topic list for house ads (#143)
* init

* more

* Pass td and colspan to component

* various fixes for house ads between n topics and add a test

* Make adComponents condition easier to read

Co-authored-by: Jordan Vidrine <[email protected]>
Co-authored-by: Penar Musaraj <[email protected]>
Co-authored-by: romanrizzi <[email protected]>
2022-07-07 08:53:29 -03:00
Isaac Janzen fb73dda584 DEV: Remove 'htmlSafe' string prototype extensions (#140)
Context: https://deprecations.emberjs.com/v3.x/#toc_ember-string-prototype_extensions
2022-06-01 11:37:01 -05:00
Jarek Radosz 7e2a490b67 DEV: Fix imports (#132) 2022-03-06 19:52:19 +01:00
Jarek Radosz c788b7bf1f DEV: Lose the es6 suffix (#131) 2022-03-05 17:23:41 +01:00
Martin Brennan 55045bba3c DEV: Update code for eslint object-shorthand-rule. See https://github.com/discourse/eslint-config-discourse/commit/4f7aba06c03fdd22bb26669aeb8ed4af3127c409 (#119) 2021-11-10 11:58:31 +11:00
tshenry f2171a51c3 FIX: use imports instead of Discourse global (#118)
Replaces `Discourse.Site` with the imported equivalent and `Discourse.SiteSettings` with `this.siteSettings`
2021-09-21 11:27:10 -07:00
Joffrey JAFFEUX 6438000ed4 DEV: prettier 2.2.1 (#101) 2021-01-27 10:36:36 +01:00
jjaffeux 9adaef17cc Revert "DEV: enforces no-var (#94)"
This reverts commit 9ad0133624.
2020-10-13 15:42:21 +02:00
Joffrey JAFFEUX 9ad0133624 DEV: enforces no-var (#94) 2020-10-13 11:40:33 +02:00
Joffrey JAFFEUX 15b2c1a05e REFACTOR: loadGoogle doesn't take any argument (#92) 2020-09-23 15:05:23 +02:00
Joffrey JAFFEUX 30dad0281d DEV: apply coding standards (#91) 2020-09-04 13:24:14 +02:00
jjaffeux 5afca0aaa1 linting 2020-08-21 16:48:41 +02:00
Lawrence Thorpe 8439608f17 FIX: isFluid parameter for in-feed adsense units (#90)
Fixes issue in #89
2020-08-21 10:24:12 -04:00
Lawrence Thorpe 50788a876e Add support for adsense fluid format for in-feed (#89) 2020-08-21 09:53:34 -04:00
Joffrey JAFFEUX 914735767a FIX: re-revert db4f5f99 with updated tests (#88)
The tests were using an incorrect value for the site setting (the name of the group instead of the id).

`no_ads_for_groups` shows groups names in the UI byt actually stores IDs.
2020-08-04 08:03:22 +02:00
Penar Musaraj db4f5f990d Revert "FIX: removes part of the 2.4 legacy code forgotten (#87)"
This reverts commit c27d5f8e85.
2020-08-03 21:44:10 -04:00
Joffrey JAFFEUX c27d5f8e85 FIX: removes part of the 2.4 legacy code forgotten (#87)
no_ads_for_groups returns a list of ids
2020-08-03 21:01:51 +02:00
Bianca Nenciu 3fc872520e FIX: CodeFund is shutting down (#85) 2020-07-10 18:09:32 +03:00
Robin Ward 3d0ee3f28a FIX: Prettier 2020-06-25 15:50:21 -04:00
Robin Ward 05967a8d52 FIX: Plugin was broken in stable 2020-06-25 14:51:14 -04:00
Rafael dos Santos Silva 4ded0bdba9 DEV: Fix usage of deprecated global 2020-06-04 17:30:26 -03:00
Joffrey JAFFEUX 270799166b REFACTOR: applies discourse core coding practices (#82) 2020-03-23 09:40:29 +01:00
Neil Lalonde cd82a905ae Load Google Ad Manager code from doubleclick.net
https://support.google.com/admanager/answer/1638622?hl=en
2020-03-13 14:24:54 -04:00
jjaffeux af346fc1c2 FIX: makes houses hads work with sk2 2020-02-07 10:34:58 +01:00
Gerhard Schlager 275921ac70 Make prettier happy 2020-01-16 00:12:27 +01:00
Neil Lalonde 116f9dd238 FEATURE: add support for fluid ad size in Google Ad Manager
No width or height will be set on containers when ad size is fluid.
2020-01-15 16:52:02 -05:00
David Taylor cf27a7be64 DEV: Stop loading external scripts while running tests (#81)
* DEV: Stop loading external scripts while running tests

* Revert "Turn of CSP for tests"

This reverts commit db1bf99277. It had no effect, since CSP is set by the server, and this was only affecting the client
2020-01-06 10:01:40 -07:00
Penar Musaraj 155d9f904c Import Promise from RSVP 2019-11-22 11:04:36 -05:00
Penar Musaraj b59f841944 DEV: Respect radix rule in eslint-config-discourse 1.0.6 2019-11-18 10:07:55 -05:00
Neil Lalonde 8d4df6df91 Rename house ad routes so ad blockers don't detect them
adplugin, house_ads, house_ad_settings become
pluginad, house_creatives, and house_settings.
2019-10-08 17:41:13 -04:00
Sam Saffron 02f9145751 lint file
AdButler is not a whitelisted constant, access it via window.
2019-09-17 13:46:32 +10:00
Neil Lalonde 51c1b89a62 Prettier 2019-09-16 14:35:58 -04:00
discoursehosting 19f0457e8c AdButler support (#80) 2019-09-16 14:26:17 -04:00
Neil Lalonde 62888e734f FIX: handle no ad size given for AdSense and DFP ad units
For AdSense, assume responsive size.
For DFP, don't attempt to render the ad unit.
2019-09-10 17:07:47 -04:00
Neil Lalonde 2ad24e4a60 FEATURE: add option to disable ads in restricted categories
Use the new setting "no ads for restricted categories".
2019-07-22 11:43:39 -04:00
Roman Rizzi 2ceb99e151 DEV: migrate no_ads_for_groups to use IDs instead of group names (#77) [Undo revert] (#79)
This reverts commit dee02ac3ba.
2019-07-19 10:29:52 -03:00
Neil Lalonde 71c51ebd8b FIX: ads always showing in all placements for CodeFund and Carbon Ads
Checkboxes used to choose which placements to have ads were not handled
correctly.
2019-07-17 14:05:58 -04:00
Roman Rizzi dee02ac3ba Revert "DEV: migrate no_ads_for_groups to use IDs instead of group names (#77)" (#78)
This reverts commit 09a92f3438.
2019-07-16 11:57:20 -03:00
Neil Lalonde 93af4587fa FIX: Amazon ads never showing 2019-07-16 10:55:39 -04:00
Roman Rizzi 09a92f3438 DEV: migrate no_ads_for_groups to use IDs instead of group names (#77) 2019-07-16 11:35:16 -03:00
Neil Lalonde 3aa9cb8a0c FIX: wrong size DFP ads when using multiple sizes
getWidthAndHeight was being called twice for each ad placement:
once when setting the size of the div, and once when calling the 
defineSlot API. getWidthAndHeight always advances to the next size
in the list, so the wrong size ad would be inserted into the div.
2019-07-15 15:34:46 -04:00
Neil Lalonde 1929ac405c lint errors 2019-07-08 15:18:34 -04:00
Neil Lalonde 333f6cef81 FEATURE: support multiple ad sizes in AdSense and Ad Manager
Each ad placement in the AdSense and Ad Manager settings takes a list
of ad sizes instead of only one size. If given multiple sizes, the sizes
will alternate in order for each ad that's rendered.
2019-07-08 15:10:25 -04:00
Neil Lalonde ad939a851a FEATURE: option to disable ads on personal messages
Use the new setting "no ads for personal messages".
2019-06-27 14:13:51 -04:00