Discourse/discourse-adplugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed all disable boxes and changed trust levels for amazon

Browse Source
This commit is contained in:
Sarah Ni
2015-09-21 10:44:37 +10:00
parent 1d762c1c00
commit fe9c53ce58
5 changed files with 6 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/javascripts/discourse/components/google-adsense.js.es6
-8
View File
@@ -52,7 +52,6 @@ var data = {
if (Discourse.SiteSettings.adsense_publisher_code) {
if (!Discourse.SiteSettings.adsense_show_topic_list_top) {
if (!Discourse.Mobile.mobileView && Discourse.SiteSettings.adsense_topic_list_top_code) {
data["topic-list-top"]["ad_code"] = Discourse.SiteSettings.adsense_topic_list_top_code;
data["topic-list-top"]["ad_width"] = parseInt(splitWidthInt(Discourse.SiteSettings.adsense_topic_list_top_ad_sizes));
@@ -61,8 +60,6 @@ if (Discourse.SiteSettings.adsense_publisher_code) {
if (Discourse.Mobile.mobileView && Discourse.SiteSettings.adsense_mobile_topic_list_top_code) {
data["topic-list-top"]["ad_mobile_code"] = Discourse.SiteSettings.adsense_mobile_topic_list_top_code;
}
}
if (!Discourse.SiteSettings.adsense_show_topic_above_post_stream) {
if (!Discourse.Mobile.mobileView && Discourse.SiteSettings.adsense_topic_above_post_stream_code) {
data["topic-above-post-stream"]["ad_code"] = Discourse.SiteSettings.adsense_topic_above_post_stream_code;
data["topic-above-post-stream"]["ad_width"] = parseInt(splitWidthInt(Discourse.SiteSettings.adsense_topic_above_post_stream_ad_sizes));
@@ -71,8 +68,6 @@ if (Discourse.SiteSettings.adsense_publisher_code) {
if (Discourse.Mobile.mobileView && Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_code) {
data["topic-above-post-stream"]["ad_mobile_code"] = Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_code;
}
}
if (!Discourse.SiteSettings.adsense_show_topic_above_suggested) {
if (!Discourse.Mobile.mobileView && Discourse.SiteSettings.adsense_topic_above_suggested_code) {
data["topic-above-suggested"]["ad_code"] = Discourse.SiteSettings.adsense_topic_above_suggested_code;
data["topic-above-suggested"]["ad_width"] = parseInt(splitWidthInt(Discourse.SiteSettings.adsense_topic_above_suggested_ad_sizes));
@@ -81,8 +76,6 @@ if (Discourse.SiteSettings.adsense_publisher_code) {
if (Discourse.Mobile.mobileView && Discourse.SiteSettings.adsense_mobile_topic_above_suggested_code) {
data["topic-above-suggested"]["ad_mobile_code"] = Discourse.SiteSettings.adsense_mobile_topic_above_suggested_code;
}
}
if (!Discourse.SiteSettings.adsense_show_post_bottom) {
if (!Discourse.Mobile.mobileView && Discourse.SiteSettings.adsense_post_bottom_code) {
data["post-bottom"]["ad_code"] = Discourse.SiteSettings.adsense_post_bottom_code;
data["post-bottom"]["ad_width"] = parseInt(splitWidthInt(Discourse.SiteSettings.adsense_post_bottom_ad_sizes));
@@ -91,7 +84,6 @@ if (Discourse.SiteSettings.adsense_publisher_code) {
if (Discourse.Mobile.mobileView && Discourse.SiteSettings.adsense_mobile_post_bottom_code) {
data["post-bottom"]["ad_mobile_code"] = Discourse.SiteSettings.adsense_mobile_post_bottom_code;
}
}
}
assets/javascripts/discourse/components/google-dfp-ad.js.es6
+4 -4
View File
@@ -76,7 +76,7 @@ function loadGoogle(settings) {
}
}
if (settings.dfp_topic_list_top_code && !settings.dfp_show_topic_list_top && settings.dfp_topic_list_top_ad_sizes) {
if (settings.dfp_topic_list_top_code && settings.dfp_topic_list_top_ad_sizes) {
const_width = parseInt(splitWidthInt(settings.dfp_topic_list_top_ad_sizes));
const_height = parseInt(splitHeightInt(settings.dfp_topic_list_top_ad_sizes));
if (Discourse.Mobile.mobileView) {
@@ -88,7 +88,7 @@ function loadGoogle(settings) {
custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_value_code)), topic_list_top)
}
}
if (settings.dfp_topic_above_post_stream_code && !settings.dfp_show_topic_above_post_stream && settings.dfp_topic_above_post_stream_ad_sizes) {
if (settings.dfp_topic_above_post_stream_code && settings.dfp_topic_above_post_stream_ad_sizes) {
const_width = parseInt(splitWidthInt(settings.dfp_topic_above_post_stream_ad_sizes));
const_height = parseInt(splitHeightInt(settings.dfp_topic_above_post_stream_ad_sizes));
if (Discourse.Mobile.mobileView) {
@@ -100,7 +100,7 @@ function loadGoogle(settings) {
custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_above_post_stream_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_above_post_stream_value_code)), topic_above_post_stream)
}
}
if (settings.dfp_topic_above_suggested_code && !settings.dfp_show_topic_above_suggested && settings.dfp_topic_above_suggested_ad_sizes) {
if (settings.dfp_topic_above_suggested_code && settings.dfp_topic_above_suggested_ad_sizes) {
const_width = parseInt(splitWidthInt(settings.dfp_topic_above_suggested_ad_sizes));
const_height = parseInt(splitHeightInt(settings.dfp_topic_above_suggested_ad_sizes));
if (Discourse.Mobile.mobileView) {
@@ -112,7 +112,7 @@ function loadGoogle(settings) {
custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_above_suggested_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_above_suggested_value_code)), topic_above_suggested)
}
}
if (settings.dfp_post_bottom_code && !settings.dfp_show_post_bottom && settings.dfp_post_bottom_ad_sizes) {
if (settings.dfp_post_bottom_code && settings.dfp_post_bottom_ad_sizes) {
const_width = parseInt(splitWidthInt(settings.dfp_post_bottom_ad_sizes));
const_height = parseInt(splitHeightInt(settings.dfp_post_bottom_ad_sizes));
if (Discourse.Mobile.mobileView) {