Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-fix1295944 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Bartosz Kosiorek]

Fix problems with calculations such as "1+=", "1/=", 1*=", and 1-=" (LP:1295944)

Fix problems with calculations such as "1+=", "1/=", 1*=", and 1-=" (LP:1295944)

[Victor Thompson (vthompson)]

I did not test for regressions, but this fixes the bug and retains the behavior discussed in the bug comments.

review: Approve

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

PASSED: Continuous integration, rev:238
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/173/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1884
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/172
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/172
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/44

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Hi,

I see, you are putting same as result, instead of that we should display message :- Malformed expression or Error.

review: Needs Fixing

[Bartosz Kosiorek (gang65)]

Thanks Mihir for comment.

If we display "error" then it will be very hard to fix that wrong calculation.
"Backspace" will not working, and all you could do is delete whole calculation. The user should have start calculation from scratch
My idea is that when you have wrong formula, you could fix that.

If you have some long formula: "3467+423423+423423+234234+23874+="
With Error message implementation, you can't fix that. You need clear all formula and retype whole formula.
With current implementation you could use "backspace".

review: Needs Information

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-fix1295944]

239. By Bartosz Kosiorek on 2014-04-26

Sync with trunk

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

PASSED: Continuous integration, rev:239
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/185/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2233
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/184
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/184
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/56

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This looks good to merge. @mihir, all good for you too?

review: Approve

[Mihir Soni (mihirsoni)]

Looks good to me as well.

Thanks Bartosz

review: Approve

=== modified file 'formula.js'
--- formula.js	2014-03-03 23:51:23 +0000
+++ formula.js	2014-04-26 15:51:03 +0000
@@ -205,14 +205,9 @@
             formula = '(' + formula + ')' + table[secondLast.type] + last.value.toString();
         }
         // In this case user press a number, and operator (or only an operator, if it isn't the first calc), and then equal
-        else if (last.type & T_OPERATOR){
-            //If user is trying to use same numbers
-            if(formula.length === 2) {
-                formulaPush(secondLast.value.toString())
-            }
+        else if (last.type & T_OPERATOR) {
             //if user has not put any number after last sign then ignore it
-            else
-                formulaPop()
+            formulaPop()
         }
         result = _calculate(formula);
 
@@ -227,7 +222,7 @@
         return result;
     }
 
-    this.changeSign = function(){
+    this.changeSign = function() {
         // If user want to change the sign of the result
         // previous.type is 16 if user do a calc, press equal, press a sign, press c and then press +/-
         if (isLastResult || previous.type === 16) {