Fix(map): remove map drawer from non-react pages
map drawer will be reserved for react pages only closes #9341
This commit is contained in:
Berkeley Martinez
276
client/main.js
276
client/main.js
@ -1,7 +1,5 @@
|
||||
var main = window.main || {};
|
||||
|
||||
main.mapShareKey = 'map-shares';
|
||||
|
||||
main.ga = window.ga || function() {};
|
||||
|
||||
main = (function(main, global) {
|
||||
@ -134,38 +132,6 @@ main = (function(main, global) {
|
||||
return main;
|
||||
}(main, window));
|
||||
|
||||
var lastCompleted = typeof lastCompleted !== 'undefined' ?
|
||||
lastCompleted :
|
||||
'';
|
||||
|
||||
main.getMapShares = function getMapShares() {
|
||||
var alreadyShared = JSON.parse(
|
||||
localStorage.getItem(main.mapShareKey) ||
|
||||
'[]'
|
||||
);
|
||||
|
||||
if (!alreadyShared || !Array.isArray(alreadyShared)) {
|
||||
localStorage.setItem(main.mapShareKey, JSON.stringify([]));
|
||||
alreadyShared = [];
|
||||
}
|
||||
return alreadyShared;
|
||||
};
|
||||
|
||||
main.setMapShare = function setMapShare(id) {
|
||||
var alreadyShared = main.getMapShares();
|
||||
var found = false;
|
||||
alreadyShared.forEach(function(_id) {
|
||||
if (_id === id) {
|
||||
found = true;
|
||||
}
|
||||
});
|
||||
if (!found) {
|
||||
alreadyShared.push(id);
|
||||
}
|
||||
localStorage.setItem(main.mapShareKey, JSON.stringify(alreadyShared));
|
||||
return alreadyShared;
|
||||
};
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
const { Observable } = window.Rx;
|
||||
@ -190,250 +156,12 @@ $(document).ready(function() {
|
||||
);
|
||||
});
|
||||
|
||||
// map sharing
|
||||
var alreadyShared = main.getMapShares();
|
||||
|
||||
if (lastCompleted && alreadyShared.indexOf(lastCompleted) === -1) {
|
||||
$('div[id="' + lastCompleted + '"]')
|
||||
.parent()
|
||||
.parent()
|
||||
.removeClass('hidden');
|
||||
}
|
||||
|
||||
// on map view
|
||||
$('.map-challenge-block-share').on('click', function(e) {
|
||||
e.preventDefault();
|
||||
var challengeBlockName = $(this).children().attr('id');
|
||||
var challengeBlockEscapedName = challengeBlockName.replace(/\s/, '%20');
|
||||
var username = typeof window.username !== 'undefined' ?
|
||||
window.username :
|
||||
'';
|
||||
|
||||
var link = 'https://www.facebook.com/dialog/feed?' +
|
||||
'app_id=1644598365767721' +
|
||||
'&display=page&' +
|
||||
'caption=I%20just%20completed%20the%20' +
|
||||
challengeBlockEscapedName +
|
||||
'%20section%20on%20Free%20Code%20Camp%2E' +
|
||||
'&link=http%3A%2F%2Ffreecodecamp%2Ecom%2F' +
|
||||
username +
|
||||
'&redirect_uri=http%3A%2F%2Ffreecodecamp%2Ecom%2Fmap';
|
||||
|
||||
main.setMapShare(challengeBlockName);
|
||||
window.ga('send', 'event', 'Facebook', 'clicked', 'Shared on Facebook');
|
||||
window.location.href = link;
|
||||
});
|
||||
|
||||
function expandCaret(item) {
|
||||
$(item)
|
||||
.prev().find('.fa-caret-right')
|
||||
.removeClass('fa-caret-right').addClass('fa-caret-down');
|
||||
}
|
||||
|
||||
function collapseCaret(item) {
|
||||
$(item)
|
||||
.prev().find('.fa-caret-down')
|
||||
.removeClass('fa-caret-down').addClass('fa-caret-right');
|
||||
}
|
||||
|
||||
function expandBlock(item) {
|
||||
$(item).addClass('in').css('height', 'auto');
|
||||
expandCaret(item);
|
||||
}
|
||||
|
||||
function collapseBlock(item) {
|
||||
$(item).removeClass('in').css('height', 'auto');
|
||||
collapseCaret(item);
|
||||
}
|
||||
|
||||
$.each($('.sr-only'), function(i, span) {
|
||||
if ($(span).text() === ' Complete') {
|
||||
$(span).parents('p').addClass('manip-hidden');
|
||||
}
|
||||
});
|
||||
|
||||
$.each($('.map-collapse'), function(i, div) {
|
||||
if ($(div).find('.manip-hidden').length ===
|
||||
$(div).find('p').length) {
|
||||
collapseBlock(div);
|
||||
$(div).prev('h3').addClass('faded');
|
||||
$(div).prev('h2').addClass('faded');
|
||||
}
|
||||
});
|
||||
|
||||
var scrollTo, dashedName = localStorage.getItem('currentDashedName'),
|
||||
elemsToSearch = $('p.padded-ionic-icon a'), currOrLastChallenge;
|
||||
if (!dashedName && $('.sr-only').length) {
|
||||
elemsToSearch = $('.sr-only');
|
||||
}
|
||||
|
||||
currOrLastChallenge = elemsToSearch.filter(function() {
|
||||
if (dashedName) {
|
||||
return $(this).attr('href').match(dashedName);
|
||||
}
|
||||
return $(this).text() === ' Complete';
|
||||
});
|
||||
|
||||
if (currOrLastChallenge.length) {
|
||||
currOrLastChallenge = currOrLastChallenge[currOrLastChallenge.length - 1];
|
||||
scrollTo = $(currOrLastChallenge).offset().top - 380;
|
||||
$('html, body, .map-accordion').scrollTop(scrollTo);
|
||||
}
|
||||
|
||||
if (String(window.location).match(/\/map$/ig)) {
|
||||
$('body>.flashMessage').find('.alert').css('display', 'none');
|
||||
$('.map-fixed-header').css('top', '50px');
|
||||
}
|
||||
|
||||
// map global selectors
|
||||
var mapFilter = $('#map-filter');
|
||||
var mapShowAll = $('#showAll');
|
||||
|
||||
$('#nav-map-btn').on('click', function(event) {
|
||||
if (!(event.ctrlKey || event.metaKey)) {
|
||||
toggleMap();
|
||||
}
|
||||
});
|
||||
|
||||
$('.map-aside-action-collapse').on('click', collapseMap);
|
||||
|
||||
function showMap() {
|
||||
if (!main.isMapAsideLoad) {
|
||||
var mapAside = $('<iframe id = "map-aside-frame" >');
|
||||
mapAside.attr({
|
||||
src: '/map-aside',
|
||||
frameBorder: '0'
|
||||
});
|
||||
$('.map-aside').append(mapAside);
|
||||
if ($('body').hasClass('night')) {
|
||||
mapAside.addClass('night');
|
||||
}
|
||||
main.isMapAsideLoad = true;
|
||||
}
|
||||
$('.map-aside').removeClass('is-collapsed');
|
||||
}
|
||||
|
||||
function collapseMap() {
|
||||
$('.map-aside').addClass('is-collapsed');
|
||||
document.activeElement.blur();
|
||||
}
|
||||
|
||||
function toggleMap() {
|
||||
var isCollapsed = $('.map-aside').hasClass('is-collapsed');
|
||||
if (isCollapsed) {
|
||||
showMap();
|
||||
} else {
|
||||
collapseMap();
|
||||
}
|
||||
}
|
||||
|
||||
mapShowAll.on('click', () => {
|
||||
var mapExpanded = mapShowAll.hasClass('active');
|
||||
if (!mapExpanded) {
|
||||
$.each($('.map-collapse:not(".in")'),
|
||||
function(i, div) {
|
||||
expandBlock(div);
|
||||
});
|
||||
mapShowAll.text('Collapse all challenges');
|
||||
return mapShowAll.addClass('active');
|
||||
} else {
|
||||
$.each($('.map-collapse.in'), function(i, div) {
|
||||
collapseBlock(div);
|
||||
});
|
||||
mapShowAll.text('Expand all challenges');
|
||||
return mapShowAll.removeClass('active');
|
||||
}
|
||||
});
|
||||
|
||||
// Map live filter
|
||||
mapFilter.on('keyup', () => {
|
||||
if (mapFilter.val().length > 0) {
|
||||
var regexString = mapFilter.val().replace(/ /g, '.');
|
||||
var regex = new RegExp(regexString.split('').join('.*'), 'i');
|
||||
|
||||
// Hide/unhide challenges that match the regex
|
||||
$('.challenge-title').each((index, title) => {
|
||||
if (regex.test($(title).attr('name'))) {
|
||||
expandBlock($(title).closest('.chapterBlock'));
|
||||
expandBlock($(title).closest('.certBlock'));
|
||||
$(title).removeClass('hidden');
|
||||
} else {
|
||||
$(title).addClass('hidden');
|
||||
}
|
||||
});
|
||||
|
||||
// Hide/unhide blocks with no matches
|
||||
$.each($('.chapterBlock'), function(i, div) {
|
||||
if ($(div).find('.hidden').length ===
|
||||
$(div).find('p').length) {
|
||||
$(div).addClass('hidden');
|
||||
$(div).prev('h3').addClass('hidden');
|
||||
} else {
|
||||
$(div).removeClass('hidden');
|
||||
$(div).prev('h3').removeClass('hidden');
|
||||
}
|
||||
});
|
||||
|
||||
// Hide/unhide superblocks with no matches
|
||||
$.each($('.certBlock'), function(i, div) {
|
||||
if ($(div).children('#nested').children('h3.hidden').length ===
|
||||
$(div).children('#nested').children('h3').length) {
|
||||
$(div).prev('h2').addClass('hidden');
|
||||
} else {
|
||||
$(div).prev('h2').removeClass('hidden');
|
||||
}
|
||||
});
|
||||
|
||||
// Display "Clear Filter" element
|
||||
if (mapFilter.next().children().hasClass('fa-search')) {
|
||||
mapFilter.next()
|
||||
.children()
|
||||
.removeClass('fa-search')
|
||||
.addClass('fa-times');
|
||||
mapFilter.next().addClass('filled');
|
||||
// Scroll to the top of the page
|
||||
$('html, body, .map-accordion').scrollTop(0);
|
||||
}
|
||||
} else {
|
||||
clearMapFilter();
|
||||
}
|
||||
|
||||
// Display not found if everything is hidden
|
||||
if ($.find('.certBlock').length ===
|
||||
$('.map-accordion').children('.hidden').length) {
|
||||
$('#noneFound').show();
|
||||
} else {
|
||||
$('#noneFound').hide();
|
||||
}
|
||||
});
|
||||
|
||||
// Give focus to the search box by default
|
||||
mapFilter.focus();
|
||||
|
||||
// Clicking the search button or x clears the map
|
||||
$('.map-buttons .input-group-addon').on('click', clearMapFilter);
|
||||
|
||||
function clearMapFilter() {
|
||||
mapFilter.val('');
|
||||
mapFilter.next().children().removeClass('fa-times').addClass('fa-search');
|
||||
mapFilter.next().removeClass('filled');
|
||||
$('.map-accordion').find('.hidden').removeClass('hidden');
|
||||
$('#noneFound').hide();
|
||||
}
|
||||
|
||||
// Clear the search on escape key
|
||||
mapFilter.on('keydown', (e) => {
|
||||
if (e.keyCode === 27) {
|
||||
e.preventDefault();
|
||||
clearMapFilter();
|
||||
}
|
||||
});
|
||||
|
||||
window.Mousetrap.bind('esc', clearMapFilter);
|
||||
|
||||
// keyboard shortcuts: open map
|
||||
window.Mousetrap.bind('g m', toggleMap);
|
||||
|
||||
function addAlert(message = '', type = 'alert-info') {
|
||||
return $('.flashMessage').append($(`
|
||||
<div class='alert ${type}'>
|
||||
@ -500,10 +228,6 @@ $(document).ready(function() {
|
||||
// Next Challenge
|
||||
window.location = '/challenges/next-challenge';
|
||||
});
|
||||
window.Mousetrap.bind('g n a', () => {
|
||||
// Account
|
||||
window.location = '/account';
|
||||
});
|
||||
window.Mousetrap.bind('g n m', () => {
|
||||
// Map
|
||||
window.location = '/map';
|
||||
|
||||
@ -7,9 +7,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
|
||||
img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', alt='learn to code javascript at Free Code Camp logo')
|
||||
.collapse.navbar-collapse
|
||||
ul.nav.navbar-nav.navbar-right.hamburger-dropdown
|
||||
li.hidden-xs
|
||||
a#nav-map-btn(href='/map' onclick='if (!(event.ctrlKey || event.metaKey)) {return false;}') Map
|
||||
li.visible-xs
|
||||
li
|
||||
a(href='/map') Map
|
||||
li.hidden-xs
|
||||
a#nav-chat-btn(href='//gitter.im/freecodecamp/freecodecamp' onclick="if (!(event.ctrlKey || event.metaKey)) {return false;}") Chat
|
||||
|
||||
Reference in New Issue
Block a user