fix countif and countifs, bump to version 2.0.5

.gitignore

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-dev
-=======
 dev
 2.0.dev
 IE-dev
 extended
->>>>>>> a452b7b72fe57a0bde4dcf8f529f56951b4c7a39

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery-calx",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "authors": [
     "Ikhsan Agustian <ikhsan017@gmail.com>"
   ],

calx.jquery.json

@@ -3,7 +3,7 @@
     "title": "jQuery Calx",
     "description": "jQuery plugin for creating calculation form or calculation table with user provided formula",
     "keywords": ["form", "calculator", "excel", "formula"],
-    "version": "2.0.4",
+    "version": "2.0.5",
     "author": {
         "name": "Ikhsan Agustian",
         "url": "http://www.xsanisty.com/"

jquery-calx-2.0.4.js → jquery-calx-2.0.5.js

@@ -4727,8 +4727,8 @@ financial: {
     },
 
     COUNTIF : function(range, criteria) {
-        var matches = 0;
-        for (var i = 0; i < range.length; i++) {
+        var matches = 0, i;
+        for (i in range) {
             if (range[i].match(new RegExp(criteria))) {
                 matches++;
             }
@@ -4740,7 +4740,8 @@ financial: {
         var criteria = (arguments.length - 1) / 2;
         var range = arguments[0];
         var result = 0;
-        for (var i = 0; i < range.length; i++) {
+        var i;
+        for (i in range) {
             var fit = true;
             for (var j = 0; j < criteria; j++) {
                 if (!eval(arguments[2 * j + 1][i] + arguments[2 * j + 2])) {
@@ -9208,7 +9209,7 @@ sheet.fx.buildCellDependency = function(){
     },
 
     notEqual: function(a,b){
-        return a!= b;
+        return a != b;
     }
 };sheet.fx.getVariable = function(varName){
     var varIndex = varName[0],
@@ -9982,6 +9983,25 @@ calculate : function(){
             calx.sheetRegistry[sheetIdentifier].calculate();
         }
     });
+},
+        /**
+ * set value of specific cell on the sheet related to the selected element,
+ * the selector should only select single object, e.g. $('#id')
+ *
+ * @param  {string} address     the cell's address
+ * @param  {string} value       the cell's value
+ * @return {void}
+ */
+setValue : function(address, value){
+    var $this       = $(this),
+        $identifier = $this.attr('data-calx-identifier'),
+        $sheet      = calx.sheetRegistry[$identifier],
+        $cell       = $sheet.getCell(address);
+
+    $cell.setValue(value);
+    $cell.processDependant();
+
+    $sheet.renderComputedValue();
 }
     };    /**
      * the surrogate of the calx world to the jQuery world

php-build/build

@@ -1,6 +1,6 @@
 <?php
-$unminifiedFile = '../jquery-calx-2.0.4.js';
-$minifiedFile   = '../jquery-calx-2.0.4.min.js';
+$unminifiedFile = '../jquery-calx-2.0.5.js';
+$minifiedFile   = '../jquery-calx-2.0.5.min.js';
 
 /**
  * gathering all js source and build into one package
@@ -25,5 +25,5 @@ $compiler = new ClosureCompiler;
 $compiler->addSourceFile($unminifiedFile);
 $compiler->setTargetFile($minifiedFile);
 
-$compiler->compile();
+echo $compiler->compile();
 ?>

php-build/build-sample

@@ -1,6 +1,6 @@
 <?php
-$unminifiedFile = '../sample/js/jquery-calx-sample-2.0.4.js';
-$minifiedFile   = '../sample/js/jquery-calx-sample-2.0.4.min.js';
+$unminifiedFile = '../sample/js/jquery-calx-sample-2.0.5.js';
+$minifiedFile   = '../sample/js/jquery-calx-sample-2.0.5.min.js';
 
 /**
  * gathering all js source and build into one package

php-build/include/calx.js

@@ -20,6 +20,7 @@
         <?php require 'include/calx/evaluate.js' ?>,
         <?php require 'include/calx/destroy.js' ?>,
         <?php require 'include/calx/reset.js' ?>,
-        <?php require 'include/calx/calculate.js' ?>
+        <?php require 'include/calx/calculate.js' ?>,
+        <?php require 'include/calx/setValue.js' ?>
 
     };

php-build/include/formula/statistic.js

@@ -179,8 +179,8 @@ statistic: {
     },
 
     COUNTIF : function(range, criteria) {
-        var matches = 0;
-        for (var i = 0; i < range.length; i++) {
+        var matches = 0, i;
+        for (i in range) {
             if (range[i].match(new RegExp(criteria))) {
                 matches++;
             }
@@ -192,7 +192,8 @@ statistic: {
         var criteria = (arguments.length - 1) / 2;
         var range = arguments[0];
         var result = 0;
-        for (var i = 0; i < range.length; i++) {
+        var i;
+        for (i in range) {
             var fit = true;
             for (var j = 0; j < criteria; j++) {
                 if (!eval(arguments[2 * j + 1][i] + arguments[2 * j + 2])) {

php-build/include/sheet/comparator.js

@@ -20,6 +20,6 @@ sheet.fx.comparator = {
     },
 
     notEqual: function(a,b){
-        return a!= b;
+        return a != b;
     }
 };

sample/app/budget_planner.html

@@ -8194,7 +8194,7 @@ <h2>Yearly Budget Planner</h2>
             </div>
         </div>
 
-        <script src="../js/jquery-calx-sample-2.0.4.min.js" type="text/javascript"></script>
+        <script src="../js/jquery-calx-sample-2.0.5.min.js" type="text/javascript"></script>
         <script src="../js/bootstrap.js" type="text/javascript"></script>
         <script>
             $('#budget_planner').calx({

sample/basic.html

@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.0.4 Sample -  Basic Calculation
+            jQuery Calx 2.0.5 Sample -  Basic Calculation
         </title>
         <link href="css/bootstrap.css" rel="stylesheet" type="text/css">
         <link href="css/sb-admin.css" rel="stylesheet" type="text/css">
@@ -20,7 +20,7 @@
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
                         <span class="sr-only">Toggle navigation</span>
                     </button>
-                    <a class="navbar-brand" href="#">jQuery Calx 2.0.4 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.0.5 Sample</a>
                 </div>
                 <div class="collapse navbar-collapse navbar-ex1-collapse">
                     <ul class="nav navbar-nav side-nav">
@@ -487,7 +487,7 @@ <h2>Basic Calculation</h2>
             </div>
         </div>
 
-        <script src="js/jquery-calx-sample-2.0.4.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.0.5.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
             $('#basic_math').calx();

sample/chart.html

@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.0.4 Sample
+            jQuery Calx 2.0.5 Sample
         </title>
         <link href="css/bootstrap.css" rel="stylesheet" type="text/css">
         <link href="css/sb-admin.css" rel="stylesheet" type="text/css">
@@ -20,7 +20,7 @@
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
                         <span class="sr-only">Toggle navigation</span>
                     </button>
-                    <a class="navbar-brand" href="#">jQuery Calx 2.0.4 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.0.5 Sample</a>
                 </div>
                 <div class="collapse navbar-collapse navbar-ex1-collapse">
                     <ul class="nav navbar-nav side-nav">
@@ -220,7 +220,7 @@ <h4 class="text-center">Bar Graph</h4>
             </div>
         </div>
 
-        <script src="js/jquery-calx-sample-2.0.4.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.0.5.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
             var calc  = $('#sheet1').calx();

sample/checkbox.html

@@ -217,7 +217,7 @@ <h3>Burger Package</h3>
             </div>
         </div>
 
-        <script src="js/jquery-calx-sample-2.0.4.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.0.5.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
             $('#pizza, #burger').calx();

sample/complex.html

@@ -569,7 +569,7 @@
 
         </table>
     </form>
-    <script src="jquery-calx-sample-2.0.4.min.js"></script>
+    <script src="jquery-calx-sample-2.0.5.min.js"></script>
 
     <script>
         $('#reset').click(function(){

sample/dynamic_form.html

@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.0.4 Sample - Checkbox, Radio Button, and Select Box
+            jQuery Calx 2.0.5 Sample - Checkbox, Radio Button, and Select Box
         </title>
         <link href="css/bootstrap.css" rel="stylesheet" type="text/css">
         <link href="css/sb-admin.css" rel="stylesheet" type="text/css">
@@ -20,7 +20,7 @@
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
                         <span class="sr-only">Toggle navigation</span>
                     </button>
-                    <a class="navbar-brand" href="#">jQuery Calx 2.0.4 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.0.5 Sample</a>
                 </div>
                 <div class="collapse navbar-collapse navbar-ex1-collapse">
                     <ul class="nav navbar-nav side-nav">
@@ -141,7 +141,7 @@ <h2>Working with Dynamic Form</h2>
             </div>
         </div>
 
-        <script src="js/jquery-calx-sample-2.0.4.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.0.5.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
             $form       = $('#dynamic').calx();