Ubuntu UI Toolkit

Merge lp:~daker/ubuntu-ui-toolkit/fix.1658121 into lp:ubuntu-ui-toolkit/staging

  1. fix.1658121
  2. Merge into staging
Proposed by Adnane Belmadiaf on 2017-01-20
Status: Merged
Approved by: Christian Dywan on 2017-01-26
Approved revision: 2162
Merged at revision: 2162
Proposed branch: lp:~daker/ubuntu-ui-toolkit/fix.1658121
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 32 lines (+11/-0)
2 files modified
components.api (+1/-0)
src/imports/Components/1.3/TextArea.qml (+10/-0)
To merge this branch: bzr merge lp:~daker/ubuntu-ui-toolkit/fix.1658121
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2017-01-26
Christian Dywan 2017-01-20 Approve on 2017-01-20
Review via email: mp+315241@code.launchpad.net

Commit Message

Expose append method in TextArea

Description of the Change

Expose append method in TextArea

To post a comment you must log in.
Christian Dywan (kalikiana) wrote :

Looks good. Thanks for adding this!

review: Approve
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~daker/ubuntu-ui-toolkit/fix.1658121/+merge/315241/+edit-commit-message

review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/603/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1618/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1403/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1368/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/182/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/909/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7470
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7471/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7468
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7469

review: Needs Fixing (continuous-integration)
Adnane Belmadiaf (daker) wrote :

What do i need to do to fix the api version issue ?

Christian Dywan (kalikiana) wrote :

> What do i need to do to fix the api version issue ?

You need to update components.api, either as part of a local 'make check' or ./tests/qmlapicheck.sh, and replacing it with the generated components.api.new. The diff between the files is what you see in the failed build log.

lp:~daker/ubuntu-ui-toolkit/fix.1658121 updated on 2017-01-25
2162. By Adnane Belmadiaf on 2017-01-25

Update to components.api

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components.api'
2--- components.api 2016-10-07 10:54:38 +0000
3+++ components.api 2017-01-25 12:54:49 +0000
4@@ -1416,6 +1416,7 @@
5 function var cut()
6 function var deselect()
7 function var insert(var position, var text)
8+ function var append(var text)
9 function var positionAt(var x, var y)
10 function var isRightToLeft(var start, var end)
11 function var moveCursorSelection(var position, var mode)
12
13=== modified file 'src/imports/Components/1.3/TextArea.qml'
14--- src/imports/Components/1.3/TextArea.qml 2016-11-10 15:36:49 +0000
15+++ src/imports/Components/1.3/TextArea.qml 2017-01-25 12:54:49 +0000
16@@ -581,6 +581,16 @@
17 }
18
19 /*!
20+ Appends a new paragraph with text to the end of the TextArea.
21+
22+ In order to append without inserting a new paragraph, call TextArea.insert(TextArea.length, text) instead.
23+ */
24+ function append(text)
25+ {
26+ editor.append(text);
27+ }
28+
29+ /*!
30 Returns the text position closest to pixel position (x, y).
31
32 Position 0 is before the first character, position 1 is after the first

Subscribers

People subscribed via source and target branches