Merge lp:~nikwen/ubuntu-calculator-app/paste-zero-fix into lp:ubuntu-calculator-app

[Niklas Wenzel]

Fix issue due to which the zero would not be pasted when using Ctrl+V

Fix issue due to which the zero would not be pasted when using Ctrl+V

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:230
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/8/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/72/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/8/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:230
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/365/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/87

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/365/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

If you paste "sin(10)" then last bracket will not be pasted (it will be "sin(10".

Could you please fix that.

Also autopilot tests for paste, will be very useful.

review: Needs Fixing

[Niklas Wenzel (nikwen)]

Thank you for your review, Bartosz. I'll fix the brackets thing as soon as possible.

However, I'm incredibly busy at the moment and it will take at least one and a half weeks until I have time for that again.

Regarding the autopilot tests: I don't know how to fit them into my schedule at the moment. If you write some though, I'll happily review them. :)

Cheers,
Niklas

[Bartosz Kosiorek (gang65)]

Your solution is good. I will separate this bug from bracket bug.
I have created bug report related to bracket paste issue:
https://bugs.launchpad.net/ubuntu-calculator-app/+bug/1516321

review: Approve

[Niklas Wenzel (nikwen)]

Thank you for merging then. I hope to fix the other issue soon. :)

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-08-02 12:16:28 +0000
+++ app/ubuntu-calculator-app.qml	2015-10-28 14:54:43 +0000
@@ -657,10 +657,10 @@
                                                 for (var j = 0; j < model.length; j++) {
                                                     var item = model[j];
                                                     if (!item.action) {
-                                                        if (item.number)
+                                                        if (item.number || item.forceNumber)
                                                             acceptedBits.push({ "chars": item.number, "push": item.number });
                                                         if (item.pushText)
-                                                            acceptedBits.push({ "chars": item.pushText, "push": item.pushText }); // TODO: Accept both if different, brackets
+                                                            acceptedBits.push({ "chars": item.pushText, "push": item.pushText });
                                                         if (item.text)
                                                             acceptedBits.push({ "chars": item.text, "push": item.pushText ? item.pushText : item.text });
                                                     }