Merge pull request #202 from Wikia/XW-4110-sb-cookies-redefined

XW-4110 | Cookie for all subdomains, cleanups, cookie setting logic

app/components/fandom-app-smart-banner.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
 import {track, trackActions} from '../utils/track';
 import {standalone, system} from '../utils/browser';
+import config from '../config/environment';
 
 const {
 	$,
@@ -15,12 +16,13 @@ export default Component.extend({
 
 	options: {
 		// Duration to hide the banner after close button is clicked (0 = always show banner)
-		daysHiddenAfterClose: 15,
+		daysHiddenAfterClose: 30,
 
 		// Duration to hide the banner after it is clicked (0 = always show banner)
-		daysHiddenAfterView: 30,
+		daysHiddenAfterView: 90,
 	},
-	dayInSeconds: 86400000,
+	dayInMiliseconds: 86400000,
+	closeButtonSelector: '.fandom-app-smart-banner__close',
 
 	i18n: inject.service(),
 
@@ -48,10 +50,14 @@ export default Component.extend({
 		}
 	},
 
-	click() {
-		this.setSmartBannerCookie(this.get('options.daysHiddenAfterView'));
+	click(event) {
+		if (event.target === this.$(this.get('closeButtonSelector'))[0]) {
+			return;
+		}
+
 		this.track(trackActions.install);
 		this.sendAction('toggleVisibility', false);
+		this.setSmartBannerCookie(this.get('options.daysHiddenAfterView'));
 	},
 
 	/**
@@ -74,18 +80,19 @@ export default Component.extend({
 	},
 
 	/**
-	 * Sets fandom-sb-closed1 cookie for given number of days
+	 * Sets fandom-sb-closed=1 cookie for given number of days
 	 *
 	 * @param {number} days
 	 * @returns {void}
 	 */
 	setSmartBannerCookie(days) {
 		const date = new Date();
 
-		date.setTime(date.getTime() + (days * this.get('dayInSeconds')));
+		date.setTime(date.getTime() + (days * this.get('dayInMiliseconds')));
 		$.cookie('fandom-sb-closed', 1, {
 			expires: date,
-			path: '/'
+			path: '/',
+			domain: config.cookieDomain
 		});
 	},