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

[Mihir Soni]

corrected output of the calculation

This change include following updates :-
if user press 9*= it'll do the the multiplication with last number.
if user press 9+= it'll do the addition with the last number

Above behavior is related to bug #1203435 which we haven't removed it.

If user press 9*5-= calculator will ignore the last sign and will calculate the result as 40. Solution of bug #1226738

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

PASSED: Continuous integration, rev:163
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/112/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/513
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/111
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/111
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/111
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/111

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

review: Approve (continuous-integration)

[lp:~mihirsoni/ubuntu-calculator-app/1226738]

164. By Mihir Soni on 2013-09-28

modified the indetation

[Riccardo Padovani (rpadovani)]

Looks good to me :)
Thanks for the work Mihir!

review: Approve

=== modified file 'formula.js'
--- formula.js	2013-09-24 19:29:44 +0000
+++ formula.js	2013-09-28 08:47:43 +0000
@@ -158,9 +158,15 @@
         if (isLastResult && !isChangeSign && table[secondLast.type] !== undefined)
             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)
-            formula = formula + secondLast.value.toString();
-
+        else if (last.type & T_OPERATOR){
+            //If user is trying to use same numbers
+            if(formula.length === 2) {
+                formulaPush(secondLast.value.toString())
+            }
+            //if user has not put any number after last sign then ignore it
+            else
+                formulaPop()
+        }
         result = _calculate(formula);
 
         // If user want to change sign to the result