feat(ads): remove ads completely

This commit is contained in:
Tyler Renelle
2015-03-19 11:39:17 -06:00
parent c880c525b4
commit 84a77695ea
7 changed files with 1 additions and 44 deletions

View File

@@ -7173,6 +7173,7 @@ process.browser = true;
process.env = {};
process.argv = [];
process.version = ''; // empty string to avoid regexp issues
process.versions = {};
function noop() {}

View File

@@ -201,23 +201,6 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
};
/*
------------------------
Ads
------------------------
*/
/**
* See conversation on http://productforums.google.com/forum/#!topic/adsense/WYkC_VzKwbA,
* Adsense is very sensitive. It must be called once-and-only-once for every <ins>, else things break.
* Additionally, angular won't run javascript embedded into a script template, so we can't copy/paste
* the html provided by adsense - we need to run this function post-link
*/
$scope.initAds = function(){
$.getScript('//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js');
(window.adsbygoogle = window.adsbygoogle || []).push({});
}
/*
------------------------
Hiding Tasks

View File

@@ -18,16 +18,6 @@ habitrpg.directive('taskFocus',
}
]);
habitrpg.directive('habitrpgAdsense', function() {
return {
restrict: 'A',
transclude: true,
replace: true,
template: '<div ng-transclude></div>',
link: function ($scope, element, attrs) {}
}
});
habitrpg.directive('whenScrolled', function() {
return function(scope, elm, attr) {
var raw = elm[0];

View File

@@ -238,9 +238,6 @@ script(id='partials/options.settings.export.html', type="text/ng-template")
mixin subPerks()
table.table.table-striped
tr
td
span.hint(popover=env.t('disableAdsText'),popover-trigger='mouseenter',popover-placement='right')=env.t('disableAds')
tr
td
span.hint(popover=env.t('buyGemsGoldText', {gemCost: "{{Shared.planGemLimits.convRate}}", gemLimit: "{{Shared.planGemLimits.convCap}}"}),popover-trigger='mouseenter',popover-placement='right') #{env.t('buyGemsGold')}&nbsp;

View File

@@ -41,11 +41,6 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html')
label=env.t('balance')
input.form-control(type='number', step="any", ng-model='hero.balance')
small!= '`user.balance`' + env.t('notGems')
.form-group
.checkbox
label
input(type='checkbox', ng-model='hero.purchased.ads')
=env.t('hideAds')
accordion
accordion-group(heading='Items')
h4 Update Item

View File

@@ -142,12 +142,4 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
br
// Ads
div(ng-if='::main && !user.purchased.ads && !user.purchased.plan.customerId && list.type!="reward" && user.stats.lvl>1')
span.pull-right
a(ui-sref='options.settings.subscription', popover=env.t('removeAds'), popover-trigger='mouseenter')
span.glyphicon.glyphicon-remove
// Habit3
ins.adsbygoogle(ng-init='initAds()', style='display: inline-block; width: 234px; height: 60px;', data-ad-client='ca-pub-3242350243827794', data-ad-slot='9529624576')
+taskColumnTabs('bottom')

View File

@@ -82,7 +82,6 @@ block content
th
h5=env.t('gameFeatures') + ':'
ul
li=env.t('gameNoAds')
li
span.dashed-underline(popover=env.t('gold2GemText'),popover-trigger='mouseenter',popover-placement='right')=env.t('gold2Gem')
li