fixed subexpressions formatting for formatFormula

joshbtn · Oct 25, 2012 · 5c0338b · 5c0338b
1 parent 574390b
commit 5c0338b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/excelFormulaUtilities-0.9.4.js b/excelFormulaUtilities-0.9.4.js
@@ -187,7 +187,8 @@
  * http://jquery.org/license
  *
  * Based on Ewbi's Go Calc Prototype Excel Formula Parser. [http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html]
- */ (function () {
+ */ 
+(function () {
     if (typeof window === 'undefined') {
       window = root;
     }
@@ -1002,7 +1003,7 @@
     var formatFormula = excelFormulaUtilities.formatFormula = function (formula, options) {
         var isFirstToken = true,
             defaultOptions = {
-                tmplFunctionStart: '\n{{autoindent}}{{token}}(\n',
+                tmplFunctionStart: '{{autoindent}}{{token}}(\n',
                 tmplFunctionStop: '\n{{autoindent}}{{token}})',
                 tmplOperandError: ' {{token}}',
                 tmplOperandRange: '{{autoindent}}{{token}}',
@@ -1014,8 +1015,8 @@
                 tmplFunctionStartArrayRow: '{',
                 tmplFunctionStopArrayRow: '}',
                 tmplFunctionStopArray: '',
-                tmplSubexpressionStart: '{{autoindent}}(',
-                tmplSubexpressionStop: ' )',
+                tmplSubexpressionStart: '{{autoindent}}(\n',
+                tmplSubexpressionStop: '\n)',
                 tmplIndentTab: '\t',
                 tmplIndentSpace: ' ',
                 autoLineBreak: 'TOK_TYPE_FUNCTION | TOK_TYPE_ARGUMENT | TOK_SUBTYPE_LOGICAL | TOK_TYPE_OP_IN ',

diff --git a/excelFormulaUtilities-0.9.4.min.js b/excelFormulaUtilities-0.9.4.min.js
diff --git a/src/ExcelFormulaUtilities.js b/src/ExcelFormulaUtilities.js
@@ -828,7 +828,7 @@
     var formatFormula = excelFormulaUtilities.formatFormula = function (formula, options) {
         var isFirstToken = true,
             defaultOptions = {
-                tmplFunctionStart: '\n{{autoindent}}{{token}}(\n',
+                tmplFunctionStart: '{{autoindent}}{{token}}(\n',
                 tmplFunctionStop: '\n{{autoindent}}{{token}})',
                 tmplOperandError: ' {{token}}',
                 tmplOperandRange: '{{autoindent}}{{token}}',
@@ -840,8 +840,8 @@
                 tmplFunctionStartArrayRow: '{',
                 tmplFunctionStopArrayRow: '}',
                 tmplFunctionStopArray: '',
-                tmplSubexpressionStart: '{{autoindent}}(',
-                tmplSubexpressionStop: ' )',
+                tmplSubexpressionStart: '{{autoindent}}(\n',
+                tmplSubexpressionStop: '\n)',
                 tmplIndentTab: '\t',
                 tmplIndentSpace: ' ',
                 autoLineBreak: 'TOK_TYPE_FUNCTION | TOK_TYPE_ARGUMENT | TOK_SUBTYPE_LOGICAL | TOK_TYPE_OP_IN ',

diff --git a/test/dev.parse.debug.html b/test/dev.parse.debug.html
@@ -9,7 +9,7 @@
     </head>
     <body>
     	<input type="text" id="txtInput" />
-
+    	<button id="parse">parse</button>
     	<div id="results">
 
     	</div>
@@ -21,13 +21,12 @@
         /*<![CDATA[*/
         	jQuery(function(){
         		var $input = $('#txtInput')
+        			,$parse = $('#parse')
         			,$results = $('#results');
 
-
-
-        		$input.bind('keyup', function(){
-
+        		$parse.bind('click', function(){
         			window.excelFormulaUtilities.parseFormula('txtInput', 'results')
+        			return false;
         		});
         	})
 		/*]]>*/