update

IamUttamKumarRoy · Mar 17, 2016 · bfc1105 · bfc1105
1 parent 415ba63
commit bfc1105
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 25 deletions.
diff --git a/assets/js/cs-plugins.js b/assets/js/cs-plugins.js
@@ -1633,18 +1633,26 @@ This file is generated by `grunt build`, do not edit it by hand.
          */
         getControlValue : function(context, control) {
 
-            // Handle radio button group
-            if(control.attr("type") == "radio" && control.size() > 1) {
-                var value = control.filter(":checked").val();
-                return value;
-            }
+          /**
+           *
+           * Codestar Framework
+           * Added multiple checkbox value control
+           *
+           * @since 1.0.0
+           * @version 1.0.0
+           *
+           */
+          if( ( control.attr("type") == "radio" || control.attr("type") == "checkbox" ) && control.size() > 1 ) {
+            return control.filter(":checked").val();
+          }
 
-            // Handle individual checkboxes & radio
-            if (control.attr("type") == "checkbox" || control.attr("type") == "radio") {
-                return control.is(":checked");
-            }
+          // Handle individual checkboxes & radio
+          if ( control.attr("type") == "checkbox" || control.attr("type") == "radio" ) {
+            return control.is(":checked");
+          }
+
+          return control.val();
 
-            return control.val();
         },
 
         /**

diff --git a/assets/js/cs-plugins.min.js b/assets/js/cs-plugins.min.js
diff --git a/assets/js/vendor/jquery.interdependencies.js b/assets/js/vendor/jquery.interdependencies.js
diff --git a/config/framework.config.php b/config/framework.config.php
@@ -8,7 +8,7 @@
   'menu_title' => 'Framework',
   'menu_type'  => 'add_menu_page',
   'menu_slug'  => 'cs-framework',
-  'ajax_save'  => true,
+  'ajax_save'  => false,
 );
 
 // ===============================================================================================
@@ -2045,7 +2045,7 @@
     array(
       'id'           => 'dep_6',
       'type'         => 'image_select',
-      'title'        => 'If check <u>Blue box</u>',
+      'title'        => 'If check <u>Blue box</u> (checkbox)',
       'options'      => array(
         'green'      => 'http://codestarframework.com/assets/images/placeholder/100x80-2ecc71.gif',
         'red'        => 'http://codestarframework.com/assets/images/placeholder/100x80-e74c3c.gif',
@@ -2066,11 +2066,40 @@
     ),
     // ------------------------------------
 
+    // ------------------------------------
+    array(
+      'id'           => 'dep_6_alt',
+      'type'         => 'image_select',
+      'title'        => 'If check <u>Green box or Blue box</u> (checkbox)',
+      'options'      => array(
+        'green'      => 'http://codestarframework.com/assets/images/placeholder/100x80-2ecc71.gif',
+        'red'        => 'http://codestarframework.com/assets/images/placeholder/100x80-e74c3c.gif',
+        'yellow'     => 'http://codestarframework.com/assets/images/placeholder/100x80-ffbc00.gif',
+        'blue'       => 'http://codestarframework.com/assets/images/placeholder/100x80-3498db.gif',
+        'gray'       => 'http://codestarframework.com/assets/images/placeholder/100x80-555555.gif',
+      ),
+      'info'         => 'Multipel Image select field input="checkbox" model. in checkbox model unselected available.',
+      'default'      => 'gray',
+      'attributes'   => array(
+        'data-depend-id' => 'dep_6_alt',
+      ),
+    ),
+
+    array(
+      'id'           => 'dummy_6_alt',
+      'type'         => 'notice',
+      'class'        => 'success',
+      'content'      => 'Green or Blue box selected!',
+      'dependency'   => array( 'dep_6_alt', 'any', 'green,blue' ),
+      //'dependency' => array( 'data-depend-id', 'any', 'value,value' ),
+    ),
+    // ------------------------------------
+
     // ------------------------------------
     array(
       'id'           => 'dep_7',
       'type'         => 'image_select',
-      'title'        => 'If check <u>Green box</u>',
+      'title'        => 'If check <u>Green box</u> (radio)',
       'options'      => array(
         'green'      => 'http://codestarframework.com/assets/images/placeholder/100x80-2ecc71.gif',
         'red'        => 'http://codestarframework.com/assets/images/placeholder/100x80-e74c3c.gif',
@@ -2097,7 +2126,7 @@
     array(
       'id'           => 'dep_7_alt',
       'type'         => 'image_select',
-      'title'        => 'If check <u>Green box or Blue box</u>',
+      'title'        => 'If check <u>Green box or Blue box</u> (radio)',
       'options'      => array(
         'green'      => 'http://codestarframework.com/assets/images/placeholder/100x80-2ecc71.gif',
         'red'        => 'http://codestarframework.com/assets/images/placeholder/100x80-e74c3c.gif',