diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-28 09:58:26 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-28 09:58:26 -0400 |
| commit | ad130849231af4387c0f3f7a6afd0a6c7e1777d9 (patch) | |
| tree | e119074141a42faaa1557ff2a2ce7629fe06294e | |
| parent | f63a1f4e47669b3e080da9ff480de5e8b1485bab (diff) | |
display browser version
| -rw-r--r-- | MediaBrowser.WebDashboard/ApiClient.js | 26 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/packages.config | 2 |
2 files changed, 22 insertions, 6 deletions
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js index 64c266775..1bb5e5f86 100644 --- a/MediaBrowser.WebDashboard/ApiClient.js +++ b/MediaBrowser.WebDashboard/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/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index d09994b2a..ed138454c 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="MediaBrowser.ApiClient.Javascript" version="3.0.146" targetFramework="net45" /> + <package id="MediaBrowser.ApiClient.Javascript" version="3.0.151" targetFramework="net45" /> <package id="ServiceStack.Common" version="3.9.56" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.55" targetFramework="net45" /> </packages>
\ No newline at end of file |