← Back to branch summary

~abreu-alexandre/unity-webapps-qml/location-specific-homepage

« back to all changes in this revision

Viewing changes to src/Ubuntu/UnityWebApps/UnityWebApps.qml

  • Committer: CI Train Bot
  • Author(s): Alexandre Abreu
  • Date: 2015-01-09 19:11:18 UTC
  • mfrom: (142.1.1 user-script-search-scheme)
  • Revision ID: ci-train-bot@canonical.com-20150109191118-ggw39u112l3uyfn4
When using a webapp-properties file for an unamed webapp the user script does not get injected. Fixes: #1409051
Approved by: PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/UnityWebApps/UnityWebApps.qml
234
234
                    __getPolicyForContent(settings),
235
235
                    customClientApiFileUrl && customClientApiFileUrl.length !== 0
236
236
                      ? customClientApiFileUrl
237
 
                      : Qt.resolvedUrl('unity-webapps-api.js'));
 
237
                      : 'unity-webapps-api.js');
238
238
 
239
239
        internal.instance = instance;
240
240
 
374
374
        if (__isValidWebAppForModel(name)) {
375
375
            if (internal.instance) {
376
376
                var userScripts = __gatherWebAppUserscriptsIfAny(name);
377
 
                internal.instance.setUserScriptsToInject(userScripts);
 
377
                internal.instance.injectWebappUserScripts(userScripts);
378
378
            }
379
379
            __navigateToWebappHomepageInBindee(name);
380
380
        }