jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-23 03:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make use of settings to prevent tracking in analytics module

Browse Source 
`SettingsService` is injected manually using `$injector` to a void a
circular dependency over `$rootScope` by `$localStorage`.
This commit is contained in:
Juan Cruz Viotti 2016-03-01 12:24:34 -04:00
parent 61a1527c7e
commit f208d2e34d
6 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/css/main.css
View File

@ -5984,5 +5984,5 @@ body {
.btn-navigation { .btn-navigation {
position: fixed; position: fixed;
top: 10px; top: 10px;
right: 15px; right: 10px;
font-size: 15px; } font-size: 15px; }

36
lib/browser/modules/analytics.js
View File

@ -32,7 +32,8 @@ window.MIXPANEL_CUSTOM_LIB_URL = '../bower_components/mixpanel/mixpanel.js';
require('../../../bower_components/mixpanel/mixpanel-jslib-snippet.js'); require('../../../bower_components/mixpanel/mixpanel-jslib-snippet.js');
require('../../../bower_components/angular-mixpanel/src/angular-mixpanel'); require('../../../bower_components/angular-mixpanel/src/angular-mixpanel');
const analytics = angular.module('Etcher.analytics', [ const analytics = angular.module('Etcher.analytics', [
'analytics.mixpanel' 'analytics.mixpanel',
'Etcher.settings'
]); ]);
analytics.config(function($mixpanelProvider) { analytics.config(function($mixpanelProvider) {
@ -55,21 +56,32 @@ analytics.config(function($mixpanelProvider) {
// TrackJS integration // TrackJS integration
// http://docs.trackjs.com/tracker/framework-integrations // http://docs.trackjs.com/tracker/framework-integrations
analytics.config(function($provide) { analytics.config(function($provide) {
$provide.decorator('$exceptionHandler', function($delegate, $window) { $provide.decorator('$exceptionHandler', function($delegate, $window, $injector) {
return function(exception, cause) { return function(exception, cause) {
$window.trackJs.track(exception); const SettingsService = $injector.get('SettingsService');
if (SettingsService.data.errorReporting) {
$window.trackJs.track(exception);
}
$delegate(exception, cause); $delegate(exception, cause);
}; };
}); });
$provide.decorator('$log', function($delegate, $window) { $provide.decorator('$log', function($delegate, $window, $injector) {
// Save the original $log.debug() // Save the original $log.debug()
let debugFn = $delegate.debug; let debugFn = $delegate.debug;
$delegate.debug = function(message) { $delegate.debug = function(message) {
message = new Date() + ' ' + message; message = new Date() + ' ' + message;
$window.trackJs.console.debug(message);
const SettingsService = $injector.get('SettingsService');
if (SettingsService.data.errorReporting) {
$window.trackJs.console.debug(message);
}
debugFn.call(null, message); debugFn.call(null, message);
}; };
@ -77,7 +89,7 @@ analytics.config(function($provide) {
}); });
}); });
analytics.service('AnalyticsService', function($log, $mixpanel) { analytics.service('AnalyticsService', function($log, $mixpanel, SettingsService) {
let self = this; let self = this;
/** /**
@ -115,10 +127,14 @@ analytics.service('AnalyticsService', function($log, $mixpanel) {
*/ */
this.logEvent = function(message, data) { this.logEvent = function(message, data) {
// Clone data before passing it to `mixpanel.track` if (SettingsService.data.errorReporting) {
// since this function mutates the object adding
// some custom private Mixpanel properties. // Clone data before passing it to `mixpanel.track`
$mixpanel.track(message, _.clone(data)); // since this function mutates the object adding
// some custom private Mixpanel properties.
$mixpanel.track(message, _.clone(data));
}
if (data) { if (data) {
message += ` (${JSON.stringify(data)})`; message += ` (${JSON.stringify(data)})`;

4
lib/css/desktop.css
View File

@ -34,3 +34,7 @@ body {
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
button:focus {
outline: none !important;
}

4
lib/index.html
View File

@ -26,6 +26,10 @@
</head> </head>
<body ng-app="Etcher" ng-controller="AppController as app" style="display: none"> <body ng-app="Etcher" ng-controller="AppController as app" style="display: none">
<div class="content row middle-xs space-horizontal-large" ng-hide="app.settings.isConfiguring()"> <div class="content row middle-xs space-horizontal-large" ng-hide="app.settings.isConfiguring()">
<button class="btn btn-link btn-navigation" ng-click="app.settings.enter()">
<span class="glyphicon glyphicon-cog"></span>
</button>
<div class="col-xs"> <div class="col-xs">
<div class="row around-xs space-bottom-huge" ng-hide="app.state.progress == 100 && !app.writer.isBurning()"> <div class="row around-xs space-bottom-huge" ng-hide="app.state.progress == 100 && !app.writer.isBurning()">
<div class="col-xs"> <div class="col-xs">

2
lib/scss/main.scss
View File

@ -187,6 +187,6 @@ body {
.btn-navigation { .btn-navigation {
position: fixed; position: fixed;
top: 10px; top: 10px;
right: 15px; right: 10px;
font-size: 15px; font-size: 15px;
} }

BIN
screenshot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 114 KiB