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

Merge pull request #64 from featheredtoast/ember-w-function

Browse Source 
FIX: resolve collision on ember's builtin w string function
This commit is contained in:
Jeff Wong 2018-05-16 13:39:24 -07:00 committed by GitHub
commit 3295a5ec26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,6 +216,8 @@ export default Ember.Component.extend({
_initGoogleDFP: function() { _initGoogleDFP: function() {
if (!this.get('showAd')) { return; } if (!this.get('showAd')) { return; }
const ember_w_function = String.prototype.w;
String.prototype.w = null;
var self = this; var self = this;
loadGoogle(this.siteSettings).then(function() { loadGoogle(this.siteSettings).then(function() {
self.set('loadedGoogletag', true); self.set('loadedGoogletag', true);
@ -229,6 +231,8 @@ export default Ember.Component.extend({
window.googletag.pubads().refresh([slot.ad]); window.googletag.pubads().refresh([slot.ad]);
} }
}); });
}).finally(function() {
String.prototype.w = ember_w_function;
}); });
}.on('didInsertElement'), }.on('didInsertElement'),