Commit ae6c4d4d authored by Mike Sheldon's avatar Mike Sheldon

Merge from upstream master

parents 5d1df35b 360e3718
...@@ -12,18 +12,18 @@ Description: | ...@@ -12,18 +12,18 @@ Description: |
Configure: none Configure: none
Builder: qtc5 Builder: qtc5
PkgConfigBR: PkgConfigBR:
- sailfishapp >= 0.0.10
- Qt5Core
- Qt5Qml
- Qt5Quick - Qt5Quick
- Qt5Qml
- Qt5Core
- sailfishapp >= 0.0.10
Requires: Requires:
- sailfishsilica-qt5 >= 0.10.9 - sailfishsilica-qt5 >= 0.10.9
Files: Files:
- /usr/share/icons/hicolor/86x86/apps
- /usr/share/applications
- /usr/share/harbour-librefm
- /usr/bin
- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
- '%{_datadir}/applications/%{name}.desktop'
- '%{_datadir}/%{name}/qml'
- '%{_bindir}' - '%{_bindir}'
- '%{_datadir}/%{name}/qml'
- '%{_datadir}/applications/%{name}.desktop'
- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
- /usr/bin
- /usr/share/harbour-librefm
- /usr/share/applications
- /usr/share/icons/hicolor/86x86/apps
...@@ -24,12 +24,12 @@ require_once($install_path . '/templating.php'); ...@@ -24,12 +24,12 @@ require_once($install_path . '/templating.php');
require_once($install_path . '/data/Server.php'); require_once($install_path . '/data/Server.php');
require_once($install_path . '/data/clientcodes.php'); require_once($install_path . '/data/clientcodes.php');
function displayError($error_msg) { // function displayError($error_msg) {
global $smarty; // global $smarty;
$smarty->assign('error_msg', $error_msg); // $smarty->assign('error_msg', $error_msg);
$smarty->display('api_auth.tpl'); // $smarty->display('api_auth.tpl');
exit(); // exit();
} // }
$smarty->assign('site_name', $site_name); $smarty->assign('site_name', $site_name);
if ($logged_in) { if ($logged_in) {
......
...@@ -94,7 +94,7 @@ $clients = array( ...@@ -94,7 +94,7 @@ $clients = array(
array('code' => 'qmm', 'api_key' => $free_apikey, 'name' => 'Qmmp', 'url' => 'http://qmmp.ylsoftware.com', 'free' => True), array('code' => 'qmm', 'api_key' => $free_apikey, 'name' => 'Qmmp', 'url' => 'http://qmmp.ylsoftware.com', 'free' => True),
array('code' => 'qmn', 'api_key' => $free_apikey, 'name' => 'QMPDClient', 'url' => 'http://bitcheese.net/wiki/QMPDClient', 'free' => True), array('code' => 'qmn', 'api_key' => $free_apikey, 'name' => 'QMPDClient', 'url' => 'http://bitcheese.net/wiki/QMPDClient', 'free' => True),
array('code' => 'qts', 'api_key' => $free_apikey, 'name' => 'QTScrobbler', 'url' => 'http://qtscrob.sourceforge.net/', 'free' => True), array('code' => 'qts', 'api_key' => $free_apikey, 'name' => 'QTScrobbler', 'url' => 'http://qtscrob.sourceforge.net/', 'free' => True),
array('code' => 'rbx', 'api_key' => $free_apikey, 'name' => 'Rhythmbox', 'url' => 'http://projects.gnome.org/rhythmbox/', 'free' => True), array('code' => 'rbx', 'api_key' => 'a string 32 characters in length', 'name' => 'Rhythmbox', 'url' => 'http://projects.gnome.org/rhythmbox/', 'free' => True),
array('code' => 'sbd', 'api_key' => $free_apikey, 'name' => 'Songbird', 'url' => 'http://www.getsongbird.com/', 'free' => True), array('code' => 'sbd', 'api_key' => $free_apikey, 'name' => 'Songbird', 'url' => 'http://www.getsongbird.com/', 'free' => True),
array('code' => 'scb', 'api_key' => $free_apikey, 'name' => 'Scrobbl', 'url' => 'http://www.last.fm/group/scrobbl', 'free' => True), array('code' => 'scb', 'api_key' => $free_apikey, 'name' => 'Scrobbl', 'url' => 'http://www.last.fm/group/scrobbl', 'free' => True),
array('code' => 'sfm', 'api_key' => $free_apikey, 'name' => 'shell-fm', 'url' => 'http://nex.scrapping.cc/shell-fm/', 'free' => True), array('code' => 'sfm', 'api_key' => $free_apikey, 'name' => 'shell-fm', 'url' => 'http://nex.scrapping.cc/shell-fm/', 'free' => True),
......
...@@ -175,11 +175,9 @@ function playerReady() { ...@@ -175,11 +175,9 @@ function playerReady() {
$('#close_tag').on('click', toggleTag); $('#close_tag').on('click', toggleTag);
$('#close_tag').hide(); $('#close_tag').hide();
$('#tag_button').on('click', tag); $('#tag_input').on('submit', function(event) {
$('#tags').keyup(function(event) { event.preventDefault();
if(event.keyCode == 13) { tag();
tag();
}
}); });
$('#tag_input').hide(); $('#tag_input').hide();
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment