Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:joshatjben/excelFormulaUtilitiesJ…

…S into rangeHandler
  • Loading branch information...
commit 83df93be892d569de4dac902fee3fb495873a55f 2 parents 9b27955 + cdffc4f
@josh3ennett authored
Showing with 28 additions and 3 deletions.
  1. +5 −1 .gitignore
  2. +23 −2 src/ExcelFormulaUtilities.js
View
6 .gitignore
@@ -1 +1,5 @@
-.c9revisions
+<<<<<<< HEAD
+node_modules
+=======
+.c9revisions
+>>>>>>> rangeHandler
View
25 src/ExcelFormulaUtilities.js
@@ -633,7 +633,6 @@
endRow = range[1].match(/[0-9]+/gi)[0];
endCol = range[1].match(/[A-Z]+/gi)[0];
- debugger;
//str.charCodeAt(n)
//String.fromCharCode();
return "";
@@ -775,7 +774,14 @@
default:
break;
+<<<<<<< HEAD
+
+ }
+
+
+=======
}
+>>>>>>> rangeHandler
return tokenString;
};
@@ -1021,10 +1027,17 @@
switch (currentFunctionOnStack.argumentNumber) {
case 0:
outstr = "?";
+<<<<<<< HEAD
+ break;
+ case 1:
+ outstr = ":";
+ break;
+=======
break;
case 1:
outstr = ":";
break;
+>>>>>>> rangeHandler
}
break;
case "sum":
@@ -1049,8 +1062,12 @@
switch (currentFunctionOnStack.name.toLowerCase()) {
// If in the sum function break aout cell names and add
case "sum":
+<<<<<<< HEAD
+ console.log(tokenString);
+=======
outstr = breakOutRanges(tokenString, "+");
+>>>>>>> rangeHandler
debugger;
//TODO loop through and add ranges together
break;
@@ -1115,4 +1132,8 @@
}
excelFormulaUtilities.getTokens = getTokens;
-}());
+<<<<<<< HEAD
+}());
+=======
+}());
+>>>>>>> rangeHandler
Please sign in to comment.
Something went wrong with that request. Please try again.