discourse/discourse-adplugin
1
0
Fork 0
mirror of https://github.com/discourse/discourse-adplugin.git synced 2025-07-08 06:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

htmlSafe and clean up

Browse Source
This commit is contained in:
Sarah Ni 2015-08-19 11:44:14 +10:00
parent 2237164075
commit fbb27c6060
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/javascripts/discourse/components/google-dfp-ad.js.es6
View File

@ -6,7 +6,6 @@ var const_height = '';
var _loaded = false, var _loaded = false,
_promise = null; _promise = null;
function splitWidthInt(value) { function splitWidthInt(value) {
var str = value.substring(0, 3); var str = value.substring(0, 3);
return str.trim(); return str.trim();
@ -78,6 +77,10 @@ export default Ember.Component.extend({
return "div-gpt-ad-" + this.get('placement'); return "div-gpt-ad-" + this.get('placement');
}.property('placement'), }.property('placement'),
adWrapperStyle: function() {
return `width: ${this.get('const_width')}px; height: ${this.get('const_height')}px;`.htmlSafe();
}.property('const_width', 'const_height'),
_initGoogleDFP: function() { _initGoogleDFP: function() {
var self = this; var self = this;
loadGoogle(this.siteSettings).then(function() { loadGoogle(this.siteSettings).then(function() {

4
assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
View File

@ -1,10 +1,8 @@
<div class="google-dfp-ad-label"><h2>Google Ad Plugin Display</h2></div> <div class="google-dfp-ad-label"><h2>Google Ad Plugin Display</h2></div>
<div id={{divId}} style='width: {{const_width}}px; height: {{const_height}}px' class="dfp-ad-unit" align=center> <div id={{divId}} style={{adWrapperStyle}} class="dfp-ad-unit" align=center>
{{#if loadedGoogletag}} {{#if loadedGoogletag}}
<script type='text/javascript'> <script type='text/javascript'>
googletag.cmd.push(function() { googletag.display('{{divId}}'); }); googletag.cmd.push(function() { googletag.display('{{divId}}'); });
</script> </script>
{{/if}} {{/if}}
</div> </div>

8
auto_generated/plugin_35b7129bb0cbeb4d26e08da97f26fb7cc56cd329.css → auto_generated/plugin_5e03562e98e357709eaba07c3a0e9054afdd7697.css
View File

@ -1,20 +1,20 @@
.discourse-google-dfp { .google-dfp-ad {
padding: 3px; padding: 3px;
margin-bottom: 10px; margin-bottom: 10px;
clear: both; clear: both;
} }
.discourse-google-dfp .dfp-ad-unit { .google-dfp-ad .dfp-ad-unit {
margin: 0 auto; margin: 0 auto;
} }
.discourse-google-dfp .google-dfp-ad-label { .google-dfp-ad .google-dfp-ad-label {
width: 728px; width: 728px;
margin: 0 auto; margin: 0 auto;
} }
.discourse-google-dfp .google-dfp-ad-label h2 { .google-dfp-ad .google-dfp-ad-label h2 {
margin: 4px 0 !important; margin: 4px 0 !important;
color: #858a8c; color: #858a8c;
text-transform: uppercase; text-transform: uppercase;