Display 'Trying to reach Musicbox.' message when initial connection to Mopidy fails.
Rename .manifest to .appcache to align with standards.
This commit is contained in:
parent
97562e4844
commit
bd703c975d
@ -1,5 +1,5 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html manifest="mb.manifest">
|
<html manifest="mb.appcache">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<script src="vendors/jquery/jquery-1.12.0.min.js"></script>
|
<script src="vendors/jquery/jquery-1.12.0.min.js"></script>
|
||||||
@ -30,15 +30,13 @@
|
|||||||
<link rel="apple-touch-icon" sizes="114x114" href="images/icons/musicbox114.png" />
|
<link rel="apple-touch-icon" sizes="114x114" href="images/icons/musicbox114.png" />
|
||||||
<link rel="shortcut icon" type="image/x-icon" href="images/icons/musicbox32.gif" />
|
<link rel="shortcut icon" type="image/x-icon" href="images/icons/musicbox32.gif" />
|
||||||
|
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
||||||
<meta name="apple-mobile-web-app-title" content="MusicBox" />
|
<meta name="apple-mobile-web-app-title" content="MusicBox" />
|
||||||
<meta name="mobile-web-app-capable" content="yes" />
|
<meta name="mobile-web-app-capable" content="yes" />
|
||||||
<meta name="HandheldFriendly" content="True" />
|
<meta name="HandheldFriendly" content="True" />
|
||||||
<meta name="MobileOptimized" content="320" />
|
<meta name="MobileOptimized" content="320" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
|
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
|
||||||
<meta name="apple-mobile-web-app-title" content="MusicBox" />
|
|
||||||
<meta http-equiv="imagetoolbar" content="no" />
|
<meta http-equiv="imagetoolbar" content="no" />
|
||||||
<meta content="true" name="MSSmartTagsPreventParsing" />
|
<meta content="true" name="MSSmartTagsPreventParsing" />
|
||||||
|
|
||||||
@ -48,8 +46,8 @@
|
|||||||
<meta name="description" content="MusicBox" />
|
<meta name="description" content="MusicBox" />
|
||||||
<meta name="author" content="Wouter van Wijk" />
|
<meta name="author" content="Wouter van Wijk" />
|
||||||
<meta name="copyright" content="(c) 2012-2016 Wouter van Wijk" />
|
<meta name="copyright" content="(c) 2012-2016 Wouter van Wijk" />
|
||||||
<link href="css/webclient.css" rel="stylesheet" />
|
<link rel="stylesheet" type="text/css" href="css/webclient.css" />
|
||||||
<link rel="stylesheet" href="vendors/font_awesome/css/font-awesome.min.css" />
|
<link rel="stylesheet" type="text/css" href="vendors/font_awesome/css/font-awesome.min.css" />
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|||||||
@ -462,12 +462,20 @@ $(document).ready(function(event) {
|
|||||||
|
|
||||||
// Connect to server
|
// Connect to server
|
||||||
if (websocketUrl) {
|
if (websocketUrl) {
|
||||||
|
try {
|
||||||
mopidy = new Mopidy({
|
mopidy = new Mopidy({
|
||||||
webSocketUrl: websocketUrl, // wslocation is set in index.html from the extention config.
|
webSocketUrl: websocketUrl,
|
||||||
callingConvention: 'by-position-or-by-name'
|
callingConvention: 'by-position-or-by-name'
|
||||||
});
|
});
|
||||||
|
} catch (e) {
|
||||||
|
showOffline(true);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
|
try {
|
||||||
mopidy = new Mopidy({callingConvention: 'by-position-or-by-name'});
|
mopidy = new Mopidy({callingConvention: 'by-position-or-by-name'});
|
||||||
|
} catch (e) {
|
||||||
|
showOffline(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//initialize events
|
//initialize events
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
CACHE MANIFEST
|
CACHE MANIFEST
|
||||||
|
|
||||||
# 2016-02-18:v1
|
# 2016-02-18:v2
|
||||||
|
|
||||||
NETWORK:
|
NETWORK:
|
||||||
*
|
*
|
||||||
@ -27,7 +27,7 @@ js/images.js
|
|||||||
js/library.js
|
js/library.js
|
||||||
js/process_ws.js
|
js/process_ws.js
|
||||||
js/progress_timer.js
|
js/progress_timer.js
|
||||||
mb.manifest
|
mb.appcache
|
||||||
system.html
|
system.html
|
||||||
vendors/font_awesome/css/font-awesome.css
|
vendors/font_awesome/css/font-awesome.css
|
||||||
vendors/font_awesome/css/font-awesome.min.css
|
vendors/font_awesome/css/font-awesome.min.css
|
||||||
Loading…
Reference in New Issue
Block a user