fix(javascript-calculator): adjust minus unicode, add noreferrer (#376)

* minus oper showing as zero fixed / rel tag * 6 or more +0 and neg num fix
freeCodeCamp · Feb 18, 2023 · 3ab3322 · 3ab3322
1 parent fa29f99
commit 3ab3322
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/apps/javascript-calculator/client/index.jsx b/apps/javascript-calculator/client/index.jsx
@@ -12,9 +12,9 @@ const projectName = 'javascript-calculator';
 // coded by @no-stack-dub-sack (github) / @no_stack_sub_sack (codepen)
 
 // VARS:
-const isOperator = /[x/+‑]/,
-  endsWithOperator = /[x+‑/]$/,
-  endsWithNegativeSign = /\d[x/+‑]{1}‑$/,
+const isOperator = /[x/+-]/,
+  endsWithOperator = /[x+-/]$/,
+  endsWithNegativeSign = /\d[x/+-]{1}-$/,
   clearStyle = { background: '#ac3939' },
   operatorStyle = { background: '#666666' },
   equalsStyle = {
@@ -59,18 +59,17 @@ class Calculator extends React.Component {
       }
       expression = expression
         .replace(/x/g, '*')
-        .replace(/‑/g, '-')
-        .replace('--', '+0+0+0+0+0+0+');
+        .replace(/-/g, '-')
+        .replace('--', '-');
       let answer = Math.round(1000000000000 * eval(expression)) / 1000000000000;
       this.setState({
         currentVal: answer.toString(),
         formula:
           expression
             .replace(/\*/g, '⋅')
-            .replace(/-/g, '‑')
-            .replace('+0+0+0+0+0+0+', '‑-')
-            .replace(/(x|\/|\+)‑/, '$1-')
-            .replace(/^‑/, '-') +
+            .replace(/-/g, '-')
+            .replace(/(x|\/|\+)-/, '$1-')
+            .replace(/^-/, '-') +
           '=' +
           answer,
         prevVal: answer,
@@ -97,7 +96,7 @@ class Calculator extends React.Component {
             (endsWithNegativeSign.test(formula + value) ? formula : prevVal) +
             value
         });
-      } else if (value !== '‑') {
+      } else if (value !== '-') {
         this.setState({
           formula: prevVal + value
         });
@@ -195,7 +194,7 @@ class Calculator extends React.Component {
         <div className='author'>
           {' '}
           Designed and Coded By <br />
-          <a href='https://goo.gl/6NNLMG' target='_blank'>
+          <a href='https://goo.gl/6NNLMG' target='_blank' rel='noreferrer'>
             Peter Weinberg
           </a>
         </div>
@@ -246,9 +245,9 @@ class Buttons extends React.Component {
           id='subtract'
           onClick={this.props.operators}
           style={operatorStyle}
-          value='‑'
+          value='-'
         >
-          ‑
+          -
         </button>
         <button id='four' onClick={this.props.numbers} value='4'>
           4