diff --git a/ApiClient.js b/ApiClient.js index 64c2667753..1bb5e5f866 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -74,15 +74,24 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { else if ($.browser.msie) { name = "Internet Explorer"; } - else if ($.browser.firefox || $.browser.mozilla) { + else if ($.browser.firefox) { name = "Firefox"; } else if ($.browser.opera) { name = "Opera"; } - else { - name = "Web Browser"; - } + + if (name) + { + if ($.browser.version) + { + name += " " + $.browser.version; + } + } + else + { + name = "Web Browser"; + } if ($.browser.ipad) { name += " Ipad"; @@ -3500,9 +3509,16 @@ MediaBrowser.SHA1 = function (msg) { /(iphone)/.exec(ua) || /(android)/.exec(ua) || []; + + var browser = match[1] || ""; + + if (ua.indexOf("like gecko") != -1 && ua.indexOf('webkit') == -1) + { + browser = "msie"; + } return { - browser: match[1] || "", + browser: browser, version: match[2] || "0", platform: platform_match[0] || "" }; diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index a1b8c5d7c6..d3c6ac0353 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -136,7 +136,7 @@ else if (device.indexOf('firefox') != -1) { imgUrl = 'css/images/clients/firefox.png'; } - else if (device == 'internet explorer') { + else if (device.indexOf('internet explorer') != -1) { imgUrl = 'css/images/clients/ie.png'; } else if (device.indexOf('safari') != -1) { diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index d0c1e853e0..3a391223ac 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -11,7 +11,7 @@ 'Did you know that the trailer plugin can automatically download trailers for existing movies in your collection?' ]; - var random = Math.floor((Math.random() * tips.length * 2)); + var random = Math.floor((Math.random() * tips.length * 1.5)); var tip = tips[random]; diff --git a/packages.config b/packages.config index d09994b2a8..ed138454cb 100644 --- a/packages.config +++ b/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file