Skip to content

INT-1610 Disable maps feature via minimally invasive change #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2016
Merged

INT-1610 Disable maps feature via minimally invasive change #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/app/models/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
11 changes: 6 additions & 5 deletions src/app/network-optin/index.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions src/app/network-optin/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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'
}
Expand Down