Permalink
Browse files

Fixed Cake File

  • Loading branch information...
1 parent 2dd0b0e commit d5e86343254eb2c32f5e3b596c506fc900d953ed @joshbtn committed Oct 11, 2012
Showing with 12 additions and 27 deletions.
  1. +3 −2 Cakefile
  2. +5 −2 excelFormulaUtilities-0.9.4.js
  3. +1 −1 excelFormulaUtilities-0.9.4.min.js
  4. +3 −22 src/ExcelFormulaUtilities.js
View
@@ -34,8 +34,9 @@ task 'build', 'Building', ->
# Minify
exec "java -jar #{COMPILER_PATH} --compilation_level SIMPLE_OPTIMIZATIONS --js ./src/core.js --js ./src/ExcelFormulaUtilities.js --js_output_file ./excelFormulaUtilities-#{VERSION}.min.js" , (err, stdout, stderr) ->
throw err if err
- cnosole.log stdout + stderr
-
+ console.log stdout + stderr
+
+ # Generate Docco Docs
exec "node #{DOCCO_PATH} ./src/*.js", (err, stdout, stderr) ->
throw err if err
console.log stdout + stderr
@@ -172,6 +172,7 @@
}());
+
/*
* excelFormulaUtilitiesJS
* https://github.com/joshatjben/excelFormulaUtilitiesJS/
@@ -807,7 +808,6 @@
endRow = range[1].match(/[0-9]+/gi)[0];
endCol = range[1].match(/[A-Z]+/gi)[0];
- debugger;
//str.charCodeAt(n)
//String.fromCharCode();
return "";
@@ -1223,6 +1223,7 @@
switch (currentFunctionOnStack.name.toLowerCase()) {
// If in the sum function break aout cell names and add
case "sum":
+
outstr = breakOutRanges(tokenString, "+");
debugger;
@@ -1289,4 +1290,6 @@
}
excelFormulaUtilities.getTokens = getTokens;
-}());
+
+}());
+

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -774,14 +774,7 @@
default:
break;
-<<<<<<< HEAD
-
- }
-
-
-=======
}
->>>>>>> rangeHandler
return tokenString;
};
@@ -1027,17 +1020,10 @@
switch (currentFunctionOnStack.argumentNumber) {
case 0:
outstr = "?";
-<<<<<<< HEAD
- break;
- case 1:
- outstr = ":";
- break;
-=======
break;
case 1:
outstr = ":";
break;
->>>>>>> rangeHandler
}
break;
case "sum":
@@ -1062,12 +1048,9 @@
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;
@@ -1132,8 +1115,6 @@
}
excelFormulaUtilities.getTokens = getTokens;
-<<<<<<< HEAD
-}());
-=======
+
}());
->>>>>>> rangeHandler
+

0 comments on commit d5e8634

Please sign in to comment.