secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
James Barnsley
2018-04-25 07:15:29 +12:00
parent 676d767b6b eda223ec91
commit 8a3e0a1f64
7 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mopidy_iris/static/app.js
View File

@ -24520,9 +24520,17 @@ var Track = function (_React$Component) {
)
);
} else if (track.added_by) {
var added = track.added_by;
var added = _react2.default.createElement(
'span',
{ className: 'by' },
track.added_by
);
} else {
var added = '-';
var added = _react2.default.createElement(
'span',
{ className: 'placeholder' },
'-'
);
}
track_columns.push(_react2.default.createElement(
@ -51391,7 +51399,7 @@ var PusherMiddleware = function () {
}
if (action.config.spotify_authorization_url) {
spotify_updates.authorization_url = action.config.authorization_url;
spotify_updates.authorization_url = action.config.spotify_authorization_url;
spotify_updated = true;
}

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/index.html
View File

@ -73,7 +73,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1524468000";
var build = "1524541685";
var version = "3.17.4";
// Construct the script tag

2
src/assets/manifest.json
View File

@ -22,7 +22,7 @@
"start_url": "/iris/index.html",
"background_color": "#08d58f",
"theme_color": "#181818",
"display": "standalone",
"display": "fullscreen",
"app": {
"background": {}
}

9
src/index.html
View File

@ -18,9 +18,12 @@
<link rel="manifest" href="/iris/assets/manifest.json">
<!-- Apple app -->
<link rel="apple-touch-startup-image" href="/iris/assets/logo-full-512.png">
<link rel="apple-touch-icon" sizes="192x192" href="/iris/assets/logo-app-192.png">
<link rel="apple-touch-icon" sizes="512x512" href="/iris/assets/logo-app-512.png">
<meta name="apple-mobile-web-app-title" content="Iris" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="#121212">
<link rel="apple-touch-startup-image" href="/iris/assets/logo-full-512.png" />
<link rel="apple-touch-icon" sizes="192x192" href="/iris/assets/logo-app-192.png" />
<link rel="apple-touch-icon" sizes="512x512" href="/iris/assets/logo-app-512.png" />
<!-- Raven Sentry -->
<script src="https://cdn.ravenjs.com/3.17.0/raven.min.js" crossorigin="anonymous"></script>

4
src/js/components/Track.js
View File

@ -235,10 +235,10 @@ export default class Track extends React.Component{
var added = <span><span className="by">{track.added_by}</span><span className="grey-text from"><span className="label">from </span>{link}</span></span>
} else if (track.added_by){
var added = track.added_by
var added = <span className="by">{track.added_by}</span>
} else {
var added = '-'
var added = <span className="placeholder">-</span>
}
track_columns.push(

2
src/js/services/pusher/middleware.js
View File

@ -542,7 +542,7 @@ const PusherMiddleware = (function(){
}
if (action.config.spotify_authorization_url){
spotify_updates.authorization_url = action.config.authorization_url;
spotify_updates.authorization_url = action.config.spotify_authorization_url;
spotify_updated = true;
}