mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-13 20:39:57 +01:00
Code Issues Releases Wiki Activity

Make tomahawk.js more portable

Browse Source
This commit is contained in:
Uwe L. Korn 2013-07-17 18:21:37 +02:00
parent fc45207ba7
commit c0b54f0410
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/js/tomahawk.js
View File

@ -18,7 +18,7 @@
*/
// if run in phantomjs add fake Tomahawk environment
if (window.Tomahawk === undefined) {
if ((typeof Tomahawk === "undefined") || (Tomahawk === null)) {
var Tomahawk = {
fakeEnv: function () {
return true;
@ -302,8 +302,8 @@ Tomahawk.asyncRequest = function (url, callback, extraHeaders, options) {
xmlHttpRequest.send(null);
};
Tomahawk.sha256 = CryptoJS.SHA256;
Tomahawk.sha256 = Tomahawk.sha256 || CryptoJS.SHA256;
// some aliases
Tomahawk.setTimeout = window.setTimeout;
Tomahawk.setInterval = window.setInterval;
Tomahawk.setTimeout = Tomahawk.setTimeout || window.setTimeout;
Tomahawk.setInterval = Tomahawk.setInterval || window.setInterval;

2
src/libtomahawk/accounts/spotify/SpotifyAccount.cpp
View File

@ -940,7 +940,7 @@ SpotifyAccount::resolverMessage( const QString &msgType, const QVariantMap &msg
{
const QString plid = msg.value( "playlistid" ).toString();
// We should already be syncing this playlist if we get updates for it
Q_ASSERT( m_updaters.contains( plid ) );
// Q_ASSERT( m_updaters.contains( plid ) );
if ( !m_updaters.contains( plid ) )
return;