Merge lp:~rpadovani/ubuntu-calculator-app/moveJavascript141209 into lp:ubuntu-calculator-app

[Riccardo Padovani]

Moved some functions to a separate javascript file to have a cleaner main.

Moved some functions to a separate javascript file to have a cleaner main.
Delete function is broken, it has been fixed in next branch: https://code.launchpad.net/~rpadovani/ubuntu-calculator-app/improveDeleteFunction141209

[Bartosz Kosiorek (gang65)]

Looks ok for me

review: Approve

=== added file 'app/engine/formula.js'
--- app/engine/formula.js	1970-01-01 00:00:00 +0000
+++ app/engine/formula.js	2014-12-09 09:31:58 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Calculator App
+ *
+ * Ubuntu Calculator App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Calculator App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Function which will delete last element in the formula
+ * It could be literal, operator, const (eg. "pi") or function (eg. "sin(" )
+ *
+ * @param bool isLastCalculate: if in the textfield there is the result of a
+ *          calc this is true and the function delete all
+ * @param string longFormula: the formula in the textfield
+ * @return a string with the new formula
+ */
+function deleteLastFormulaElement(isLastCalculate, longFormula) {
+    if (isLastCalculate === true) {
+        return '';
+    }
+
+    if (longFormula !== '') {
+        var removeSize = 1;
+        longFormula = longFormula.substring(0, longFormula.length - removeSize);
+    }
+
+    return longFormula;
+}
+
+/**
+ * Function to check if a char is an operator
+ *
+ * @param char digit: the digit to check if is a valid operator
+ * @return bool that indicates if the digit is a valid operator
+ */
+function isOperator(digit) {
+    switch(digit) {
+        case "+":
+        case "-":
+        case "*":
+        case "/":
+        case "%":
+        case "^":
+            return true;
+        default:
+            return false;
+    }
+}
+
+/**
+ * Function to replace some chars in the visual textfield
+ *
+ * @param string engineFormulaToDisplay: the string where we have to replace chars
+ * @return a string based on param with changes in chars
+ */
+function returnFormulaToDisplay(engineFormulaToDisplay) {
+    var engineToVisualMap = {
+        '-': '−',
+        '/': '÷',
+        '*': '×',
+        '.': decimalPoint,
+        'NaN': i18n.tr("NaN"),
+        'Infinity': '∞'
+    }
+
+    if (engineFormulaToDisplay !== undefined) {
+        for (var engineElement in engineToVisualMap) {
+            // FIXME: need to add 'g' flag, but "new RegExp(engineElement, 'g');"
+            // is not working for me
+            engineFormulaToDisplay = engineFormulaToDisplay.replace(
+                engineElement, engineToVisualMap[engineElement]);
+        }
+    }
+    else {
+        engineFormulaToDisplay = '';
+    }
+
+    return engineFormulaToDisplay;
+}

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2014-12-09 08:59:08 +0000
+++ app/ubuntu-calculator-app.qml	2014-12-09 09:31:58 +0000
@@ -22,6 +22,7 @@
 import "ui"
 import "engine"
 import "engine/math.js" as MathJs
+import "engine/formula.js" as Formula
 
 MainView {
     id: mainView
@@ -64,47 +65,28 @@
 
     property var decimalPoint: Qt.locale().decimalPoint
 
-    //Function which will delete last formula element.
-    // It could be literal, operator, const (eg. "pi") or function (eg. "sin(" )
+    /**
+     * The function calls the Formula.deleteLastFormulaElement function and
+     * place the result in right vars
+     */
     function deleteLastFormulaElement() {
-        if (isLastCalculate === true) {
-            longFormula = '';
+        if (longFormula[longFormula.length - 1] === ".") {
+            isAllowedToAddDot = true;
         }
 
-        if (longFormula !== '') {
-            var removeSize = 1;
-            if (longFormula[longFormula.length - 1] === ".") {
-                isAllowedToAddDot = true;
-            }
-            longFormula = longFormula.substring(0, longFormula.length - removeSize);
-        }
+        longFormula = Formula.deleteLastFormulaElement(isLastCalculate, longFormula);
         shortFormula = longFormula;
         displayedInputText = returnFormulaToDisplay(longFormula);
     }
 
-    // Check if the given digit is one of the valid operators or not.
-    function isOperator(digit) {
-        switch(digit) {
-        case "+":
-        case "-":
-        case "*":
-        case "/":
-        case "%":
-        case "^":
-            return true;
-        default:
-            return false;
-        }
-    }
-
     function validateStringForAddingToFormula(stringToAddToFormula) {
-        if (isOperator(stringToAddToFormula)) {
+        if (Formula.isOperator(stringToAddToFormula)) {
             if ((longFormula === '') && (stringToAddToFormula !== '-')) {
                 // Do not add operator at beginning
                 return false;
             }
 
-            if ((isOperator(previousVisual) && previousVisual !== ")")) {
+            if ((Formula.isOperator(previousVisual) && previousVisual !== ")")) {
                 // Not two operator one after otQt.locale().decimalPointher
                 return false;
             }
@@ -136,23 +118,6 @@
         return true;
     }
 
-    function returnFormulaToDisplay(engineFormulaToDisplay) {
-        var engineToVisualMap = {
-            '-': '−',
-            '/': '÷',
-            '*': '×',
-            '.': decimalPoint,
-            'NaN': i18n.tr("NaN"),
-            'Infinity': '∞'
-        }
-
-        for (var engineElement in engineToVisualMap) {
-            //FIXME need to add 'g' flag, but "new RegExp(engineElement, 'g');" is not working for me
-            engineFormulaToDisplay = engineFormulaToDisplay.replace(engineElement, engineToVisualMap[engineElement]);
-        }
-        return engineFormulaToDisplay;
-    }
-
     function formulaPush(visual) {
         // If the user press a number after the press of "=" we start a new
         // formula, otherwise we continue with the old one
@@ -173,7 +138,6 @@
         // We save the value until next value is pushed
         previousVisual = visual;
 
-
         // If we add an operator after an operator we know has priority,
         // we display a temporary result instead the all operation
         if (isNaN(visual) && (visual.toString() !== ".") && isFormulaIsValidToCalculate) {
@@ -191,7 +155,7 @@
         shortFormula += visual.toString();
 
         try {
-            displayedInputText = returnFormulaToDisplay(shortFormula);
+            displayedInputText = Formula.returnFormulaToDisplay(shortFormula);
         } catch(exception) {
             console.log("Error: " + exception.toString());
             return;
@@ -224,7 +188,7 @@
         }
 
         try {
-            displayedInputText = returnFormulaToDisplay(result)
+            displayedInputText = Formula.returnFormulaToDisplay(result)
         } catch(exception) {
             console.log("Error: " + exception.toString());
             return;

=== modified file 'app/ui/Screen.qml'
--- app/ui/Screen.qml	2014-12-08 13:30:24 +0000
+++ app/ui/Screen.qml	2014-12-09 09:31:58 +0000
@@ -19,6 +19,7 @@
 import Ubuntu.Components 1.1
 
 import "../upstreamcomponents"
+import "../engine/formula.js" as Formula
 
 ListItemWithActions {
     id: root
@@ -60,7 +61,7 @@
             width: parent.width - equal.width - result.width
             anchors.bottom: parent.bottom
 
-            text: returnFormulaToDisplay(model.contents.formula)
+            text: Formula.returnFormulaToDisplay(model.contents.formula)
             font.pixelSize: units.gu(3)
             lineHeight: units.gu(1) + 1
             lineHeightMode: Text.FixedHeight