ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #03519
Re: [Merge] lp:~nikwen/ubuntu-terminal-app/layout-i18n into lp:ubuntu-terminal-app
Just found something while looking through the diff. Will fix it. :)
Diff comments:
>
> === modified file 'src/app/qml/KeyboardRows/jsonParser.js'
> --- src/app/qml/KeyboardRows/jsonParser.js 2015-02-14 12:46:38 +0000
> +++ src/app/qml/KeyboardRows/jsonParser.js 2015-07-13 17:22:19 +0000
> @@ -27,8 +27,8 @@
> raiseException("type is missing in", actionObject);
> if (!isAllowed(actionObject.type, ["key", "string"]))
> raiseException("type must be either key or string in", actionObject);
> - if (!actionObject.text)
> - raiseException("text is missing in", actionObject);
> + if (actionObject.id && actionObject.text)
> + raiseException("Should not define id and text together in ", layoutObject);
Should also have an
if (!actionObject.id && !actionObject.text)
check.
>
> switch (actionObject.type) {
> case "key":
--
https://code.launchpad.net/~nikwen/ubuntu-terminal-app/layout-i18n/+merge/264620
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~nikwen/ubuntu-terminal-app/layout-i18n into lp:ubuntu-terminal-app.
References