From 4815f98e8c3e99d23d1b4819e0bb8e665b1a4881 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Mon, 27 Jun 2016 19:18:59 -0700 Subject: [PATCH] Fix(map): remove map drawer from non-react pages map drawer will be reserved for react pages only closes #9341 --- client/main.js | 276 ------------------------------ server/views/partials/navbar.jade | 4 +- 2 files changed, 1 insertion(+), 279 deletions(-) diff --git a/client/main.js b/client/main.js index 999e5b1fb4..3670e120dd 100644 --- a/client/main.js +++ b/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 = $('