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

Digesting links in broadcast and injecting (still need to remove all other HTML)

Browse Source
This commit is contained in:
James Barnsley
2019-02-05 17:04:32 +13:00
parent bdc9935596
commit 31e62fdf81
7 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mopidy_iris/static/app.js
View File

@ -5764,9 +5764,15 @@ function getBroadcasts() {
return function (dispatch, getState) {
var config = {
method: 'GET',
timeout: 15000,
url: 'https://gist.githubusercontent.com/jaedb/b677dccf80daf3ccb2ef12e96e495677/raw'
};
timeout: 15000
// Fetch the "iris_broadcasts.json" file from Gist (or "_test" for test mode)
};if (getState().ui.test_mode) {
config.url = 'https://gist.githubusercontent.com/jaedb/cb3a5ee6909632abb2e0fe66d4c8c311/raw';
} else {
config.url = 'https://gist.githubusercontent.com/jaedb/b677dccf80daf3ccb2ef12e96e495677/raw';
}
$.ajax(config).then(function (response) {
dispatch({
type: 'BROADCASTS_LOADED',
@ -59050,10 +59056,23 @@ var UIMiddleware = function () {
if (!suppressed_broadcasts.includes(broadcast.key)) {
if (broadcast.message) {
var content = broadcast.message;
// Digest raw content and drop in links where appropriate
if (broadcast.links) {
for (var link_name in broadcast.links) {
if (broadcast.links.hasOwnProperty(link_name)) {
var link = broadcast.links[link_name];
var link_markup = '<a href="' + link.url + '"' + (link.new_window ? ' target="_blank" ' : '') + '>' + link.text + '</a>';
content = content.replace('$' + link_name, link_markup);
}
}
}
var data = {
key: broadcast.key ? broadcast.key : null,
title: broadcast.title ? broadcast.title : null,
content: broadcast.message,
content: content,
type: 'broadcast',
sticky: true
};

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

File diff suppressed because one or more lines are too long

4
mopidy_iris/static/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/index.html
View File

@ -98,7 +98,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1549244903";
var build = "1549339394";
var version = "3.32.1";
// Construct the script tag

11
src/js/services/core/actions.js
View File

@ -7,9 +7,16 @@ export function getBroadcasts(){
return (dispatch, getState) => {
var config = {
method: 'GET',
timeout: 15000,
url: 'https://gist.githubusercontent.com/jaedb/b677dccf80daf3ccb2ef12e96e495677/raw'
timeout: 15000
}
// Fetch the "iris_broadcasts.json" file from Gist (or "_test" for test mode)
if (getState().ui.test_mode){
config.url = 'https://gist.githubusercontent.com/jaedb/cb3a5ee6909632abb2e0fe66d4c8c311/raw'
} else {
config.url = 'https://gist.githubusercontent.com/jaedb/b677dccf80daf3ccb2ef12e96e495677/raw'
}
$.ajax(config).then(
response => {
dispatch({

15
src/js/services/ui/middleware.js
View File

@ -180,10 +180,23 @@ const UIMiddleware = (function(){
if (!suppressed_broadcasts.includes(broadcast.key)){
if (broadcast.message){
var content = broadcast.message;
// Digest raw content and drop in links where appropriate
if (broadcast.links){
for (var link_name in broadcast.links){
if (broadcast.links.hasOwnProperty(link_name)){
var link = broadcast.links[link_name];
var link_markup = '<a href="'+link.url+'"'+(link.new_window ? ' target="_blank" ' : '')+'>'+link.text+'</a>';
content = content.replace('$'+link_name, link_markup);
}
}
}
var data = {
key: (broadcast.key ? broadcast.key : null),
title: (broadcast.title ? broadcast.title : null),
content: broadcast.message,
content: content,
type: 'broadcast',
sticky: true
}