From fa57b780f5d73cbff14e7681e9c431f05abff084 Mon Sep 17 00:00:00 2001 From: Matt Kangas Date: Fri, 1 Jul 2016 12:41:17 -0400 Subject: [PATCH] INT-1610 Disable maps feature via minimally invasive change --- src/app/models/preferences.js | 5 +++++ src/app/network-optin/index.jade | 11 ++++++----- src/app/network-optin/index.js | 15 ++++++++------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/app/models/preferences.js b/src/app/models/preferences.js index a3f6982c81b..05aa7f6224f 100644 --- a/src/app/models/preferences.js +++ b/src/app/models/preferences.js @@ -250,6 +250,11 @@ var Preferences = Model.extend(storageMixin, { * returns either true or false */ isFeatureEnabled: function(feature) { + // INT-1610 force maps off until we have a MapBox commercial license + if (feature === 'enableMaps') { + return false; + } + // master network switch overwrites all network related features if (['enableMaps', 'trackErrors', 'enableFeedbackPanel', 'trackUsageStatistics', 'autoUpdates'].indexOf(feature) !== -1) { diff --git a/src/app/network-optin/index.jade b/src/app/network-optin/index.jade index 510345048a4..f4bfbaf11c0 100644 --- a/src/app/network-optin/index.jade +++ b/src/app/network-optin/index.jade @@ -13,11 +13,12 @@ span Enable Product Feedback Tool p.option-description Enables a tool for sending feedback or talking to our Product and Development teams directly from Compass. - li - label - input(type='checkbox', name='enableMaps', data-hook='enable-maps-checkbox') - span Enable Geographic Visualizations - p.option-description Allow Compass to make requests to a 3rd party mapping service. + // INT-1610 force maps off until we have a MapBox commercial license + //- li + //- label + //- input(type='checkbox', name='enableMaps', data-hook='enable-maps-checkbox') + //- span Enable Geographic Visualizations + //- p.option-description Allow Compass to make requests to a 3rd party mapping service. li label diff --git a/src/app/network-optin/index.js b/src/app/network-optin/index.js index 56d8cc7390b..d9bb6e1d01f 100644 --- a/src/app/network-optin/index.js +++ b/src/app/network-optin/index.js @@ -17,8 +17,8 @@ var NetworkOptInView = View.extend({ trackErrors: ['boolean', true, true], enableFeedbackPanel: ['boolean', true, true], trackUsageStatistics: ['boolean', true, true], - autoUpdates: ['boolean', true, true], - enableMaps: ['boolean', true, true] + autoUpdates: ['boolean', true, true] + // enableMaps: ['boolean', true, true] }, session: { preferences: 'state', @@ -53,11 +53,12 @@ var NetworkOptInView = View.extend({ hook: 'usage-stats-checkbox', name: 'checked' }, - enableMaps: { - type: 'booleanAttribute', - hook: 'enable-maps-checkbox', - name: 'checked' - }, + // INT-1610 force maps off until we have a MapBox commercial license + // enableMaps: { + // type: 'booleanAttribute', + // hook: 'enable-maps-checkbox', + // name: 'checked' + // }, buttonTitle: { hook: 'start-button' }