diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js index 294684099..ed405484e 100644 --- a/app/assets/javascripts/app/app.js +++ b/app/assets/javascripts/app/app.js @@ -24,6 +24,24 @@ function parametersFromURL(url) { return obj; } +function getPlatformString() { + try { + var platform = navigator.platform.toLowerCase(); + var trimmed = ""; + if(platform.indexOf("mac") !== -1) { + trimmed = "mac"; + } else if(platform.indexOf("win") !== -1) { + trimmed = "windows"; + } if(platform.indexOf("linux") !== -1) { + trimmed = "linux"; + } + + return trimmed + (isDesktopApplication() ? "-desktop" : "-web"); + } catch (e) { + return null; + } +} + function isDesktopApplication() { return window && window.process && window.process.type && window.process.versions["electron"]; } diff --git a/app/assets/javascripts/app/controllers/home.js b/app/assets/javascripts/app/controllers/home.js index 788ea7e54..6d8805094 100644 --- a/app/assets/javascripts/app/controllers/home.js +++ b/app/assets/javascripts/app/controllers/home.js @@ -4,21 +4,7 @@ angular.module('app') storageManager.initialize(passcodeManager.hasPasscode(), authManager.isEphemeralSession()); - try { - $scope.platform = function() { - var platform = navigator.platform.toLowerCase(); - var trimmed = ""; - if(platform.indexOf("mac") !== -1) { - trimmed = "mac"; - } else if(platform.indexOf("win") !== -1) { - trimmed = "windows"; - } if(platform.indexOf("linux") !== -1) { - trimmed = "linux"; - } - - return trimmed + (isDesktopApplication() ? "-desktop" : "-web"); - }(); - } catch (e) {} + $scope.platform = getPlatformString(); $scope.onUpdateAvailable = function(version) { $rootScope.$broadcast('new-update-available', version); diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js index 37c23eeb4..5d8fb15aa 100644 --- a/app/assets/javascripts/app/services/componentManager.js +++ b/app/assets/javascripts/app/services/componentManager.js @@ -804,7 +804,8 @@ class ComponentManager { componentData: component.componentData, data: { uuid: component.uuid, - environment: isDesktopApplication() ? "desktop" : "web" + environment: isDesktopApplication() ? "desktop" : "web", + platform: getPlatformString() } }); this.postActiveThemeToComponent(component);