[Merge] lp:~mardy/webbrowser-app/single-account into lp:webbrowser-app
Alberto Mardegan
alberto.mardegan at canonical.com
Tue Sep 30 08:45:39 UTC 2014
Replied to the comment (tl;dr: yes, better keep that log).
Diff comments:
> === modified file 'src/app/webcontainer/AccountsLoginPage.qml'
> --- src/app/webcontainer/AccountsLoginPage.qml 2014-08-28 13:07:26 +0000
> +++ src/app/webcontainer/AccountsLoginPage.qml 2014-09-26 14:09:38 +0000
> @@ -43,6 +43,11 @@
> accountProvider: root.accountProvider
> applicationName: root.applicationName
> onCountChanged: checkAccounts()
> + onFinished: {
> + if (count === 0) {
> + Qt.quit();
> + }
> + }
> }
>
> Rectangle {
> @@ -57,10 +62,9 @@
>
> function checkAccounts() {
> checkTimer.stop()
> + console.log("Accounts: " + accountsModel.count)
I think it's useful, it's the first thing I'd want to know when something doesn't behave as expected.
> if (accountsModel.count === 0) {
> - // Skip the account creation step for now (see the Note below)
> -// accountsViewLoader.sourceComponent = accountsAdditionToolbarViewComponent
> - done(null);
> + accountsModel.createNewAccount()
> } else {
> doLogin(accountsModel.model.get(0, "accountServiceHandle"))
> }
>
> === modified file 'src/app/webcontainer/AccountsModel.qml'
> --- src/app/webcontainer/AccountsModel.qml 2014-02-21 14:55:14 +0000
> +++ src/app/webcontainer/AccountsModel.qml 2014-09-26 14:09:38 +0000
> @@ -26,6 +26,8 @@
> property string applicationName: ""
> property alias count: accountsModel.count
>
> + signal finished
> +
> function createNewAccount() {
> setup.exec();
> }
> @@ -43,6 +45,7 @@
> id: setup
> applicationId: root.applicationName
> providerId: root.accountProvider
> + onFinished: root.finished()
> }
> }
>
>
--
https://code.launchpad.net/~mardy/webbrowser-app/single-account/+merge/236128
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.
More information about the Ubuntu-reviews
mailing list