From ff46cccb9dbad27e94a9bff62d9a9b186786b566 Mon Sep 17 00:00:00 2001
From: Mottie <wowmotty@gmail.com>
Date: Fri, 23 May 2014 07:48:23 -0500
Subject: [PATCH] Math: values are now obtained from data-attributes first

---
 docs/example-widget-math.html | 12 +++++++++---
 js/widgets/widget-math.js     | 24 +++++++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/docs/example-widget-math.html b/docs/example-widget-math.html
index 74b0e2cf..c21ca9e5 100644
--- a/docs/example-widget-math.html
+++ b/docs/example-widget-math.html
@@ -181,6 +181,12 @@
 		<h3><a href="#">Notes</a></h3>
 		<div>
 		<ul>
+			<li>In <span class="version">v2.17.1</span>,
+				<ul>
+					<li>Values added to the data-attribute set by the <a href="../#textattribute"><code>textAttribute</code> option</a> will now be used in the calculation instead of the actual cell content.</li>
+					<li>The Grand Total cells now shows a higher precision value to emphasize this point.</li>
+				</ul>
+			</li>
 			<li>In <span class="version">v2.16.4</span>, added:
 				<ul>
 					<li>Two new options: <code>math_prefix</code> and <code>math_suffix</code>, which will be added before or after the prefix or suffix, respectively.</li>
@@ -513,7 +519,7 @@ BAD => No minus (-) here! $#,###.00 or [-] here either <= BAD</textarea>
 		</tr>
 		<tr>
 			<th colspan="5">Grand Total</th>
-			<th data-math="all-sum" data-math-mask="##0.00">all-sum</th>
+			<th data-math="all-sum" data-math-mask="##0.0000">all-sum</th>
 		</tr>
 	</tfoot>
 
@@ -536,8 +542,8 @@ BAD => No minus (-) here! $#,###.00 or [-] here either <= BAD</textarea>
 
 	<tbody>
 		<tr><th>North</th><td>Joseph</td><td>$ 3,643</td><td>$ 5,846</td><td>$ 6,574</td><td class="totals" data-math="row-sum">row-sum</td></tr>
-		<tr><th>North</th><td>Lawrence</td><td>$ 4,456</td><td>$ 6,658</td><td>$ 7,685</td><td class="totals" data-math="row-sum">row-sum</td></tr>
-		<tr><th>North</th><td>Maria</td><td>$ 6,235</td><td>$ 4,616.99</td><td>$ 3,612.33</td><td class="totals" data-math="row-sum">row-sum</td></tr>
+		<tr><th>North</th><td>Lawrence</td><td>$ 4,456</td><td>$ 6,658</td><td data-text="$ 7,685.0049">$ 7,685</td><td class="totals" data-math="row-sum">row-sum</td></tr>
+		<tr><th>North</th><td>Maria</td><td>$ 6,235</td><td>$ 4,616.99</td><td data-text="3612.3267">$ 3,612.33</td><td class="totals" data-math="row-sum">row-sum</td></tr>
 		<tr><th>North</th><td>Matt</td><td>$ 3,868</td><td>$ 3,926</td><td>$ 3,254</td><td class="totals" data-math="row-sum">row-sum</td></tr>
 	</tbody>
 
diff --git a/js/widgets/widget-math.js b/js/widgets/widget-math.js
index 42c33984..947ba3ba 100644
--- a/js/widgets/widget-math.js
+++ b/js/widgets/widget-math.js
@@ -12,7 +12,8 @@
 
 		// get all of the row numerical values in an arry
 		getRow : function(table, wo, $el, dataAttrib) {
-			var txt,
+			var $t, txt,
+				c = table.config,
 				arry = [],
 				$row = $el.closest('tr'),
 				$cells = $row.children();
@@ -21,7 +22,11 @@
 					$cells = $cells.not('[' + dataAttrib + '=ignore]').not('[data-column=' + wo.math_ignore.join('],[data-column=') + ']');
 				}
 				arry = $cells.not($el).map(function(){
-					txt = this.textContent || $(this).text();
+					$t = $(this);
+					txt = $t.attr(c.textAttribute);
+					if (typeof txt === "undefined") {
+						txt = this.textContent || $t.text();
+					}
 					txt = ts.formatFloat(txt.replace(/[^\w,. \-()]/g, ""), table);
 					return isNaN(txt) ? 0 : txt;
 				}).get();
@@ -52,7 +57,10 @@
 						if (mathAbove) {
 							i = 0;
 						} else if ($t.length) {
-							txt = $t[0].textContent || $t.text();
+							txt = $t.attr(c.textAttribute);
+							if (typeof txt === "undefined") {
+								txt = $t[0].textContent || $t.text();
+							}
 							txt = ts.formatFloat(txt.replace(/[^\w,. \-()]/g, ""), table);
 							arry.push(isNaN(txt) ? 0 : txt);
 						}
@@ -63,7 +71,10 @@
 				$rows.each(function(){
 					$t = $(this).children().filter('[data-column=' + cIndex + ']');
 					if (!$(this).hasClass(filtered) && $t.not('[' + dataAttrib + '^=above],[' + dataAttrib + '^=col]').length && !$t.is($el)) {
-						txt = ($t[0] ? $t[0].textContent : '') || $t.text();
+						txt = $t.attr(c.textAttribute);
+						if (typeof txt === "undefined") {
+							txt = ($t[0] ? $t[0].textContent : '') || $t.text();
+						}
 						txt = ts.formatFloat(txt.replace(/[^\w,. \-()]/g, ""), table);
 						arry.push(isNaN(txt) ? 0 : txt);
 					}
@@ -85,7 +96,10 @@
 						$t = $(this);
 						col = parseInt( $t.attr('data-column'), 10);
 						if (!$t.filter('[' + dataAttrib + ']').length && $.inArray(col, wo.math_ignore) < 0) {
-							txt = ($t[0] ? $t[0].textContent : '') || $t.text();
+							txt = $t.attr(c.textAttribute);
+							if (typeof txt === "undefined") {
+								txt = ($t[0] ? $t[0].textContent : '') || $t.text();
+							}
 							txt = ts.formatFloat(txt.replace(/[^\w,. \-()]/g, ""), table);
 							arry.push(isNaN(txt) ? 0 : txt);
 						}