mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Make promises available to resolvers as well

Browse Source
This commit is contained in:
Dominik Schmidt
2014-11-11 19:13:36 +01:00
parent d5fab40884
commit f075259b8d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libtomahawk/resolvers/JSInfoSystemHelper.cpp
View File

@@ -39,7 +39,6 @@ JSInfoSystemHelper::~JSInfoSystemHelper()
QStringList JSInfoSystemHelper::requiredScriptPaths() const QStringList JSInfoSystemHelper::requiredScriptPaths() const
{ {
return QStringList() return QStringList()
<< RESPATH "js/es6-promise-2.0.0.min.js"
<< RESPATH "js/tomahawk-infosystem.js"; << RESPATH "js/tomahawk-infosystem.js";
} }

4
src/libtomahawk/resolvers/JSResolver.cpp
View File

@@ -211,6 +211,10 @@ JSResolver::init()
// add c++ part of tomahawk javascript library // add c++ part of tomahawk javascript library
d->engine->mainFrame()->addToJavaScriptWindowObject( "Tomahawk", d->resolverHelper ); d->engine->mainFrame()->addToJavaScriptWindowObject( "Tomahawk", d->resolverHelper );
// load es6-promises shim
loadScript( RESPATH "js/es6-promise-2.0.0.min.js" );
// Load CrytoJS core // Load CrytoJS core
loadScript( RESPATH "js/cryptojs-core.js" ); loadScript( RESPATH "js/cryptojs-core.js" );