Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/incubateNull into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Handle incubateObject returning null in PageWrapperUtils

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1682
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2375/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1105
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1102

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2375/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

cool, thanks.

review: Approve

=== modified file 'src/Ubuntu/Components/1.3/PageWrapperUtils.js'
--- src/Ubuntu/Components/1.3/PageWrapperUtils.js	2015-09-29 05:24:47 +0000
+++ src/Ubuntu/Components/1.3/PageWrapperUtils.js	2015-10-12 14:38:34 +0000
@@ -73,8 +73,10 @@
             incubator = pageComponent.incubateObject(pageWrapper);
         }
 
-        pageWrapper.incubator.status = incubator.status;
-        if (incubator.status != Component.Ready) {
+        if (!incubator) {
+            throw new Error("Error while loading page: " + pageComponent.errorString());
+        } else if (incubator.status != Component.Ready) {
+            pageWrapper.incubator.status = incubator.status;
             incubator.onStatusChanged = incubatorStatusChanged;
         } else {
             incubatorStatusChanged(incubator.status);