← Back to branch summary

~ubuntu-branches/ubuntu/saucy/unity-webapps-qml/saucy

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Alexandre Abreu, Ubuntu daily release
  • Date: 2013-09-07 02:04:08 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20130907020408-owwuy87tsrfyodi6
Tags: 0.1+13.10.20130907-0ubuntu1
[ Alexandre Abreu ]
* Simplify/fix autopilot tests; Handle better local usage of webapps
  component (for local apps).
* Fix icon name generation.

[ Ubuntu daily release ]
* Automatic snapshot from revision 55

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/UnityWebApps/UnityWebApps.qml
380
380
 
381
381
        return {
382
382
            init: function (params) {
383
 
                console.debug('initi called')
384
383
                if (! isValidInitCall(params)) {
385
 
                    console.debug('Invalid init call');
386
384
                    return;
387
385
                }
388
386
 
410
408
                            base.initCompleted.disconnect(onInitCompleted);
411
409
                            if (success) {
412
410
                                initialized = true;
413
 
 
414
 
                                console.debug(JSON.stringify(params));
415
 
 
416
411
                                callOnInitScriptFunc();
417
412
                            }
418
413
                        };
419
414
 
420
415
                        base.initCompleted.connect(onInitCompleted);
421
416
 
 
417
                        var isLocal = params.__unity_webapps_hidden && params.__unity_webapps_hidden.local;
422
418
                        var url = params.__unity_webapps_hidden && params.__unity_webapps_hidden.url
423
419
                                ? params.__unity_webapps_hidden.url : "";
424
 
                        base.init(webappName, url, params);
 
420
                        base.init(webappName, url, isLocal, params);
425
421
                    });
426
422
                }
427
423
                else {