Merge pull request #39 from mozilla/toggle-recommendations
Toggle recommendations
This commit is contained in:
Коммит
58c4896cb0
|
@ -40,11 +40,13 @@
|
|||
<li ng-click="generateDebugReport()"><a href="#">Generate debug report</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a data-toggle="modal" data-target="#uninstallModal" href="#">Uninstall</a></li>
|
||||
<li class="divider"></li>
|
||||
<li ng-click="setRecommendationTabVisibility()"><a href="#">{{recommenderTabToggle}}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="tabWrapper" role="tabpanel">
|
||||
<ul class="nav navbar-nav navbar-right" role="tablist">
|
||||
<li role="presentation" class="active"><a href="#yourInterests" aria-controls"yourInterests" role="tab" data-toggle="tab" >Your Interests</a></li>
|
||||
<li id="interests_tab" role="presentation" class="active"><a href="#yourInterests" aria-controls"yourInterests" role="tab" data-toggle="tab" >Your Interests</a></li>
|
||||
<li id="recommend_tab" role="presentation"><a href="#recommendations" aria-controls"recommendations" role="tab" data-toggle="tab" >Your Recommendations</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
"use strict";
|
||||
|
||||
const SHOW_RECOMMENDATIONS_TAB = "Show Recommendations Tab";
|
||||
const HIDE_RECOMMENDATIONS_TAB = "Hide Recommendations Tab";
|
||||
const PROCESSING_BLURB = "Analyzing your history...";
|
||||
const ID_LINK = "https://www.mozilla.org/en-US/firefox/interest-dashboard/";
|
||||
|
||||
let table, tour;
|
||||
|
||||
let DataService = function($rootScope) {
|
||||
|
@ -27,6 +32,7 @@ aboutYou.controller("vizCtrl", function($scope, dataService) {
|
|||
$scope.daysLeft = null;
|
||||
$scope.daysLeftStart = null;
|
||||
$scope.percentProcessed = null;
|
||||
$scope.recommenderTabToggle = SHOW_RECOMMENDATIONS_TAB;
|
||||
dataService.send("chart_data_request");
|
||||
}
|
||||
$scope.safeApply = function(fn) {
|
||||
|
@ -68,7 +74,7 @@ aboutYou.controller("vizCtrl", function($scope, dataService) {
|
|||
};
|
||||
|
||||
$scope.updateProgressBar = function(value) {
|
||||
$scope.processingBlurb = "Analyzing your history...";
|
||||
$scope.processingBlurb = PROCESSING_BLURB;
|
||||
|
||||
let val = value ? value : (100 - Math.round($scope.daysLeft / $scope.daysLeftStart * 100));
|
||||
$scope.percentProcessed = val + "%"
|
||||
|
@ -79,6 +85,24 @@ aboutYou.controller("vizCtrl", function($scope, dataService) {
|
|||
dataService.send("uninstall_addon");
|
||||
};
|
||||
|
||||
$scope.setRecommendationTabVisibility = function() {
|
||||
let displayVal = "initial";
|
||||
$scope.recommenderTabToggle = HIDE_RECOMMENDATIONS_TAB;
|
||||
if ($('#recommend_tab').css("display") == "block") {
|
||||
displayVal = "none";
|
||||
$scope.recommenderTabToggle = SHOW_RECOMMENDATIONS_TAB;
|
||||
|
||||
// Switching focus to recommendations bubble content
|
||||
$('#yourInterests').addClass("active");
|
||||
$('#recommendations').removeClass("active");
|
||||
|
||||
// Adjusting highligted tab
|
||||
$('#interests_tab').addClass("active");
|
||||
$('#recommend_tab').removeClass("active");
|
||||
}
|
||||
$('#recommend_tab').css("display", displayVal);
|
||||
};
|
||||
|
||||
$scope.processHistory = function() {
|
||||
if ($scope.daysLeft) {
|
||||
return;
|
||||
|
@ -197,7 +221,7 @@ BrowserTour.prototype.bindEvents = function () {
|
|||
this.$closeButton.on('click', this.closeTour.bind(this));
|
||||
$('.cta button').on('click', () => {
|
||||
this.closeTour();
|
||||
window.open("https://www.mozilla.org/en-US/firefox/interest-dashboard/", '_blank');
|
||||
window.open(ID_LINK, '_blank');
|
||||
});
|
||||
$('button.step').on('click', this.onStepClick.bind(this));
|
||||
this.$tourControls.on('mouseenter focus', 'button.step', this.onStepHover.bind(this));
|
||||
|
|
Загрузка…
Ссылка в новой задаче