tobast/glowingbear-mainbox
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix matching (#segments)

Browse source
This commit is contained in:
Lorenz Hübschle-Schneider 2014-07-14 23:17:22 +01:00
parent 885b47eaaf
commit 8e1e871411
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
js/plugins.js
View file

@ -292,14 +292,13 @@ plugins.factory('userPlugins', function() {
if (match) { if (match) {
var url = match[0]; var url = match[0];
var regexp = /^https?:\/\/(?:www\.)?yr\.no\/(place|stad|sted|sadji)\/([^\s.;,(){}<>\/]+)\/([^\s.;,(){}<>\/]+)\/([^\s.;,(){}<>\/]+)/; var regexp = /^https?:\/\/(?:www\.)?yr\.no\/(place|stad|sted|sadji|paikka)\/(([^\s.;,(){}<>\/]+\/){3,})/;
match = url.match(regexp); match = url.match(regexp);
if (match) { if (match) {
var language = match[1]; var language = match[1];
var country = match[2]; var location = match[2];
var province = match[3]; var city = match[match.length - 1].slice(0, -1);
var city = match[4]; url = "http://www.yr.no/" + language + "/" + location + "avansert_meteogram.png";
url = "http://www.yr.no/" + language + "/" + country + "/" + province + "/" + city + "/avansert_meteogram.png";
return "<img src='" + url + "' alt='Meteogram for " + city + "' />"; return "<img src='" + url + "' alt='Meteogram for " + city + "' />";
} }
} }