Merge lp:~mihirsoni/ubuntu-calculator-app/RemovedOnclick-1207685 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Mihir Soni]

Removed the paste behavior from the all number operands as it is not desired.

Removed the paste behavior from the all number operands as it is not desired.

[David Planella (dpm)]

Thanks for the fix Mihir!

However, this removes the "tapping to get last result" capability altogether. I think the point of the bug was not to remove this feature, but simply stop it from pasting after the first time.

That is:

1. Tap on the previous result
2. Result appears in the current calculation
3. Tap on the previous result
4. Nothing happens, as the result is already on the current calculation

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calculator-app/RemovedOnclick-1207685]

123. By Mihir Soni on 2013-08-05

Removed On Clicked from the previous result

[Riccardo Padovani (rpadovani)]

After last commit needs fixing, there are some bugs:

History works only once:
- Do a calc
- Tear off the calc
- Click on result
- Do another calc and tear off
- Click on new calc
- Nothing happens.

Multiple click:
- Do a calc (e.g 6x7) and tear off
- Click twice on the result (42)
- Result appeare only one time (it's ok)
- Finish the calc, (e.g + 3)
- Expected: 45, but the result is 4245 (like the second click was on queue)

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calculator-app/RemovedOnclick-1207685]

124. By Mihir Soni on 2013-08-05

User can only copy the result to the new calculation by tapping on result

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

PASSED: Continuous integration, rev:124
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/57/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/49
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/49

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

review: Approve (continuous-integration)

[David Planella (dpm)]

This change is unnecessary and should not be part of the merge proposal, as it only changes indentation:

42 + screenFormula[screenFormula.length - 1]._number += last.value.toString();

After testing the branch I noticed a regression:

1. Start a calculation with 89 + 6 =
2. Without tearing off the calculation, tap on the result.

Actual result:

- The second operand (6) is replaced from the operation by the result (95), and the new result becomes empty

Expected result:

- Nothing happens

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calculator-app/RemovedOnclick-1207685]

125. By Mihir Soni on 2013-08-09

Removed copying result from the any of previous result

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

FAILED: Continuous integration, rev:125
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/66/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/58/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/66/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/66/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/58

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:125
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/68/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/60
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/60

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

28 - isLast: (isLastItem && index === repeater.model.count-1)

This change is probably not correct. The isLast thing is used by some autopilot tests.

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calculator-app/RemovedOnclick-1207685]

126. By Mihir Soni on 2013-08-09

Removed copying result from the any of previous result

127. By Mihir Soni on 2013-08-09

Removed extra spaces

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

PASSED: Continuous integration, rev:126
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/69/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/61
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/69
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/69
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/61

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

review: Approve (continuous-integration)

[lp:~mihirsoni/ubuntu-calculator-app/RemovedOnclick-1207685]

128. By Mihir Soni on 2013-08-09

Removed extra spaces

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected! Thanks for the fix!

review: Approve

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2013-08-08 14:10:35 +0000
+++ Simple/CalcLabel.qml	2013-08-09 20:36:05 +0000
@@ -37,9 +37,6 @@
     MouseArea {
         anchors.fill: parent
         propagateComposedEvents: true
-        onClicked: {
-            addFromMemory(root.numbers)
-        }
     }
 
     Row{