From bdc88d40223afbb0d752bcfdf6128cf26bc33b2d Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 30 Jul 2013 17:03:27 +0000 Subject: [PATCH] fix platform/browser parsing --- static/js/statisticsDialog.js | 4 ++-- static/js/usersDialog.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/static/js/statisticsDialog.js b/static/js/statisticsDialog.js index e7ca710ac..b0273fa2b 100644 --- a/static/js/statisticsDialog.js +++ b/static/js/statisticsDialog.js @@ -18,8 +18,8 @@ pandora.ui.statisticsDialog = function() { 'RIM Tablet OS': [64, 64, 64], 'Unix': [255, 255, 0], 'Wii': [192, 192, 192], - 'Windows': [0, 0, 255], - 'Windows Phone': [0, 0, 128] + 'Windows Phone': [0, 0, 128], // has to be before 'Windows' + 'Windows': [0, 0, 255] }, browser: { 'Camino': [192, 192, 192], diff --git a/static/js/usersDialog.js b/static/js/usersDialog.js index ed28a415b..9c9abe665 100644 --- a/static/js/usersDialog.js +++ b/static/js/usersDialog.js @@ -5,7 +5,7 @@ pandora.ui.usersDialog = function() { var browsers = [ - 'Camino', 'Chrome', 'Chrome Frame', 'Chromium', 'Epiphany', + 'Camino', 'Chrome Frame', 'Chrome', 'Chromium', 'Epiphany', 'Firefox', 'Internet Explorer', 'Konqueror', 'Nokia Browser', 'Opera', 'Safari', 'WebKit' ], @@ -15,8 +15,8 @@ pandora.ui.usersDialog = function() { numberOfUsers = 0, systems = [ 'Android', 'BlackBerry', 'BSD', 'iOS', 'Java', 'Linux', 'Mac OS X', - 'Nokia', 'PlayStation', 'RIM Tablet OS', 'Unix', 'Wii', 'Windows', - 'Windows Phone' + 'Nokia', 'PlayStation', 'RIM Tablet OS', 'Unix', 'Wii', + 'Windows Phone', 'Windows' ], userLevels = pandora.site.userLevels.map(function(userLevel) { return Ox.toTitleCase(userLevel);