Merge lp:~robin-gloster/ubuntu-calculator-app/empty-formula-mem into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Robin Gloster]

don't add empty formula to memory

Doesn't add empty formula to memory.

[Dalius (dalius-sandbox)]

You are putting me in uncomfortable situation :) This is already fixed in this branch: http://bazaar.launchpad.net/~f-riccardo87/ubuntu-calculator-app/tweaks/revision/18

review: Approve

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~robin-gloster/ubuntu-calculator-app/empty-formula-mem/+merge/151115/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Robin Gloster (robin-gloster)]

Sorry didn't notice. If it happens again just remove it if it's easier for you :)

=== modified file 'calculator.qml'
--- calculator.qml	2013-02-27 12:22:41 +0000
+++ calculator.qml	2013-02-28 22:20:26 +0000
@@ -154,10 +154,12 @@
                         property color color: "#FFFFFF";
 
                         function addCurrentToMemory() {
-                            memory.get(memory.count-1).isLastItem = false
-                            memory.get(memory.count-1).formula_data = JSON.stringify(formula)
-                            memory.append({'formula': memory.get(memory.count-1).formula, 'answer': memory.get(count-1).answer, 'formula_data': '', 'isLastItem': true})
-                            positionViewAtEnd();
+                            if (formula_text !== '') {
+                                memory.get(memory.count-1).isLastItem = false
+                                memory.get(memory.count-1).formula_data = JSON.stringify(formula)
+                                memory.append({'formula': memory.get(memory.count-1).formula, 'answer': memory.get(count-1).answer, 'formula_data': '', 'isLastItem': true})
+                                positionViewAtEnd();
+                            }
                         }
 
                         function showError() {