update build & bump version to 2.2.6

xsanisty · Feb 19, 2016 · 4f08958 · 4f08958
1 parent 4debc9e
commit 4f08958
Show file tree

Hide file tree

Showing 20 changed files with 1,068 additions and 437 deletions.
diff --git a/jquery-calx-2.2.5.js → jquery-calx-2.2.6.js b/jquery-calx-2.2.5.js → jquery-calx-2.2.6.js
@@ -1,3 +1,13 @@
+/**
+ * jQuery Calx 2.2.6
+ *
+ * author       : Xsanisty Developer Team <developers@xsanisty.com>
+ *                Ikhsan Agustian <ikhsan017@gmail.com>
+ * website      : http://www.xsanisty.com/project/calx2
+ * repository   : https://github.com/xsanisty/jquery-calx
+ * license      : MIT
+ */
+
 if(typeof(Zepto)     == 'undefined'){
     Zepto    = undefined;
 }
@@ -19,7 +29,7 @@ if(typeof(jStat)     == 'undefined'){
     if(typeof($) == 'undefined'){
         return false;
     }
-    
+
     /************************************************
      *                Begin of IE Hack              *
      ************************************************/
@@ -3523,11 +3533,15 @@ date: {
         var criteria = (arguments.length - 1) / 2;
         var range = utility.objectToArray(arguments[0]);
         var result = 0;
+
         for (var i = 0; i < range.length; i++) {
             var fit = true;
             for (var j = 0; j < criteria; j++) {
-                if (!eval(arguments[2 * j + 1][i] + arguments[2 * j + 2])) {
-                    fit = false;
+                var criteria_clause = arguments[2 * j + 1];
+                var criteria_range  = utility.objectToArray(arguments[2 * j + 2]);
+
+                if (fit) {
+                    fit = this.evaluate(criteria_range[i] + criteria_clause);
                 }
             }
             result += (fit) ? range[i] : 0;
@@ -5812,7 +5826,7 @@ logical : {
 
 },
     geometry : {
-    
+
 },
     text:{
     CONCAT : function(){
@@ -6081,7 +6095,7 @@ logical : {
     }
 },
     trigonometry:{
-    
+
 },
     general: {
 
@@ -9904,7 +9918,7 @@ sheet.fx.detachEvent = function(){
         isCalculating : false,
 
         /** Calx version */
-        version : '2.2.5',
+        version : '2.2.6',
 
         /** sheets collection */
         sheetRegistry : {},

diff --git a/jquery-calx-2.2.5.min.js → jquery-calx-2.2.6.min.js b/jquery-calx-2.2.5.min.js → jquery-calx-2.2.6.min.js
diff --git a/php-build/build b/php-build/build
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
-$unminifiedFile = '../jquery-calx-2.2.5.js';
-$minifiedFile   = '../jquery-calx-2.2.5.min.js';
+$unminifiedFile = '../jquery-calx-2.2.6.js';
+$minifiedFile   = '../jquery-calx-2.2.6.min.js';
 
 /**
  * gathering all js source and build into one package
@@ -26,5 +26,5 @@ $compiler = new ClosureCompiler;
 $compiler->addSourceFile($unminifiedFile);
 $compiler->setTargetFile($minifiedFile);
 
-echo $compiler->compile();
+$compiler->compile();
 ?>
diff --git a/php-build/build-sample b/php-build/build-sample
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
-$unminifiedFile = '../sample/js/jquery-calx-sample-2.2.5.js';
-$minifiedFile   = '../sample/js/jquery-calx-sample-2.2.5.min.js';
+$unminifiedFile = '../sample/js/jquery-calx-sample-2.2.6.js';
+$minifiedFile   = '../sample/js/jquery-calx-sample-2.2.6.min.js';
 
 /**
  * gathering all js source and build into one package

diff --git a/php-build/calx-build-sample.php b/php-build/calx-build-sample.php
@@ -7,4 +7,4 @@
 require '../js/flot_plugin/jquery.flot.categories.js';
 require '../js/flot_plugin/jquery.flot.pie.js';
 require '../js/flot_plugin/jquery.flot.stack.js';
-require '../jquery-calx-2.2.5.min.js';
+require '../jquery-calx-2.2.6.min.js';
diff --git a/php-build/calx-build.php b/php-build/calx-build.php
@@ -1,4 +1,14 @@
 <?php header('Content-Type', 'text/javascript') ?>
+/**
+ * jQuery Calx 2.2.6
+ *
+ * author       : Xsanisty Developer Team <developers@xsanisty.com>
+ *                Ikhsan Agustian <ikhsan017@gmail.com>
+ * website      : http://www.xsanisty.com/project/calx2
+ * repository   : https://github.com/xsanisty/jquery-calx
+ * license      : MIT
+ */
+
 if(typeof(Zepto)     == 'undefined'){
     Zepto    = undefined;
 }

diff --git a/php-build/include/calx.js b/php-build/include/calx.js
@@ -7,7 +7,7 @@
         isCalculating : false,
 
         /** Calx version */
-        version : '2.2.5',
+        version : '2.2.6',
 
         /** sheets collection */
         sheetRegistry : {},

diff --git a/sample/app/budget_planner.html b/sample/app/budget_planner.html
@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.2.5 Sample
+            jQuery Calx 2.2.6 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.2.5 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.2.6 Sample</a>
                 </div>
                 <div class="collapse navbar-collapse navbar-ex1-collapse">
                     <ul class="nav navbar-nav side-nav">
@@ -8194,7 +8194,7 @@ <h2>Yearly Budget Planner</h2>
             </div>
         </div>
 
-        <script src="../js/jquery-calx-sample-2.2.5.min.js" type="text/javascript"></script>
+        <script src="../js/jquery-calx-sample-2.2.6.min.js" type="text/javascript"></script>
         <script src="../js/bootstrap.js" type="text/javascript"></script>
         <script>
             $('#budget_planner').calx({

diff --git a/sample/basic.html b/sample/basic.html
@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.2.5 Sample -  Basic Calculation
+            jQuery Calx 2.2.6 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.2.5 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.2.6 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.2.5.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.2.6.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
             $('#basic_math').calx();

diff --git a/sample/chart.html b/sample/chart.html
@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.2.5 Sample
+            jQuery Calx 2.2.6 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.2.5 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.2.6 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.2.5.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.2.6.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
             var calc  = $('#sheet1').calx();

diff --git a/sample/checkbox.html b/sample/checkbox.html
@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.2.5 Sample - Checkbox, Radio Button, and Select Box
+            jQuery Calx 2.2.6 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.2.5 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.2.6 Sample</a>
                 </div>
                 <div class="collapse navbar-collapse navbar-ex1-collapse">
                     <ul class="nav navbar-nav side-nav">
@@ -217,7 +217,7 @@ <h3>Burger Package</h3>
             </div>
         </div>
 
-        <script src="js/jquery-calx-sample-2.2.5.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.2.6.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
             $('#pizza, #burger').calx();

diff --git a/sample/complex.html b/sample/complex.html
@@ -569,7 +569,7 @@
 
         </table>
     </form>
-    <script src="jquery-calx-sample-2.2.5.min.js"></script>
+    <script src="jquery-calx-sample-2.2.6.min.js"></script>
 
     <script>
         $('#reset').click(function(){

diff --git a/sample/data.html b/sample/data.html
@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.2.5 Sample
+            jQuery Calx 2.2.6 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-brandom" href="#">jQuery Calx 2.2.5 Sample</a>
+                    <a class="navbar-brandom" href="#">jQuery Calx 2.2.6 Sample</a>
                 </div>
                 <div class="collapse navbar-collapse navbar-ex1-collapse">
                     <ul class="nav navbar-nav side-nav">
@@ -134,7 +134,7 @@
             </div>
         </div>
 
-        <script src="js/jquery-calx-sample-2.2.5.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.2.6.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
             $('#calx').calx({

diff --git a/sample/dynamic_form.html b/sample/dynamic_form.html
@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.2.5 Sample - Checkbox, Radio Button, and Select Box
+            jQuery Calx 2.2.6 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.2.5 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.2.6 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.2.5.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.2.6.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
             $form       = $('#dynamic').calx();

diff --git a/sample/formula.html b/sample/formula.html
@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.2.5 Sample - Formula Showcase
+            jQuery Calx 2.2.6 Sample - Formula Showcase
         </title>
         <link href="css/bootstrap.css" rel="stylesheet" type="text/css">
         <link href="css/sb-admin.css" rel="stylesheet" type="text/css">
@@ -35,7 +35,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.2.5 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.2.6 Sample</a>
                 </div>
                 <div class="collapse navbar-collapse navbar-ex1-collapse">
                     <ul class="nav navbar-nav side-nav">
@@ -196,7 +196,7 @@ <h2>Formula Showcase</h2>
             </div>
         </div>
 
-        <script src="js/jquery-calx-sample-2.2.5.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.2.6.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>
 

diff --git a/sample/index.html b/sample/index.html
@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
         <title>
-            jQuery Calx 2.2.5 Sample
+            jQuery Calx 2.2.6 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.2.5 Sample</a>
+                    <a class="navbar-brand" href="#">jQuery Calx 2.2.6 Sample</a>
                 </div>
                 <div class="collapse navbar-collapse navbar-ex1-collapse">
                     <ul class="nav navbar-nav side-nav">
@@ -66,7 +66,7 @@
             </div>
         </div>
 
-        <script src="js/jquery-calx-sample-2.2.5.min.js" type="text/javascript"></script>
+        <script src="js/jquery-calx-sample-2.2.6.min.js" type="text/javascript"></script>
         <script src="js/bootstrap.js" type="text/javascript"></script>
         <script>