ubuntu-touch-coreapps-reviewers team mailing list archive

[Niklas Wenzel <nikwen.developer@xxxxxxxxx>]

Niklas Wenzel has proposed merging lp:~nikwen/ubuntu-calculator-app/paste-zero-fix into lp:ubuntu-calculator-app.

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

Requested reviews:
  Ubuntu Calculator Developers (ubuntu-calculator-dev)

For more details, see:
https://code.launchpad.net/~nikwen/ubuntu-calculator-app/paste-zero-fix/+merge/276011

Fix issue due to which the zero would not be pasted when using Ctrl+V
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~nikwen/ubuntu-calculator-app/paste-zero-fix into lp:ubuntu-calculator-app.

=== 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 });
                                                     }