Merge lp:~robru/friends-app/140chars into lp:friends-app

Proposed by Robert Bruce Park
Status: Merged
Approved by: Ken VanDine
Approved revision: 68
Merged at revision: 70
Proposed branch: lp:~robru/friends-app/140chars
Merge into: lp:friends-app
Diff against target: 26 lines (+2/-3)
1 file modified
qml/Post.qml (+2/-3)
To merge this branch: bzr merge lp:~robru/friends-app/140chars
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ken VanDine Approve
Review via email: mp+158979@code.launchpad.net

Commit message

Fix off-by-one error when calculating tweet lengths. (LP: #1168899)

Description of the change

Use <= instead of < to allow 140 char messages.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:68
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robru/friends-app/140chars/+merge/158979/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/friends-app-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-raring-amd64-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-app-ci/1/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Post.qml'
2--- qml/Post.qml 2013-04-09 19:30:24 +0000
3+++ qml/Post.qml 2013-04-15 17:14:27 +0000
4@@ -89,7 +89,7 @@
5 placeholderText: i18n.tr("Compose")
6 autoSize: true
7 maximumLineCount: 0
8- color: text.length < 140 ? "gray" : "red"
9+ color: text.length <= 140 ? "gray" : "red"
10 textFormat: TextEdit.PlainText
11 contentWidth: width - units.gu(5)
12 onHeightChanged: {
13@@ -158,7 +158,7 @@
14 width: units.gu(9)
15 height: units.gu(4)
16 text: i18n.tr("Send")
17- enabled: entryArea.text.length < 140
18+ enabled: entryArea.text.length <= 140
19 onClicked: {
20 for (var i=0; i<accountsModel.count; i++) {
21 if (accountsModel.get(i).sendEnabled) {
22@@ -275,4 +275,3 @@
23 }
24 }
25 }
26-

Subscribers

People subscribed via source and target branches