From: Pratik Joshi <pratik.joshi@webaccess.co.in>
Date: Thu, 27 Jun 2013 10:28:00 +0000 (+0530)
Subject: CRM-12942 : added closure for function definition and its usage, as to remove its... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d9aa50a7770da20275c353726fc0d9072de1fea6;p=civicrm-core.git

CRM-12942 : added closure for function definition and its usage, as to remove its global definition as mentioned in comment for PR#1059
---

diff --git a/CRM/Custom/Form/Group.php b/CRM/Custom/Form/Group.php
index 912e64da33..5e75eee8c2 100644
--- a/CRM/Custom/Form/Group.php
+++ b/CRM/Custom/Form/Group.php
@@ -352,12 +352,8 @@ class CRM_Custom_Form_Group extends CRM_Core_Form {
     $this->addElement('checkbox', 'is_active', ts('Is this Custom Data Set active?'));
 
     // does this set have multiple record?
-    $multiple = $this->addElement('checkbox',
-      'is_multiple',
-      ts('Does this Custom Field Set allow multiple records?'),
-      NULL,
-      array('onclick' => "showRange();")
-    );
+    $multiple = $this->addElement('checkbox', 'is_multiple',
+      ts('Does this Custom Field Set allow multiple records?'), NULL);
 
     // $min_multiple = $this->add('text', 'min_multiple', ts('Minimum number of multiple records'), $attributes['min_multiple'] );
     // $this->addRule('min_multiple', ts('is a numeric field') , 'numeric');
diff --git a/templates/CRM/Custom/Form/Group.tpl b/templates/CRM/Custom/Form/Group.tpl
index 7ef18246df..334812a259 100644
--- a/templates/CRM/Custom/Form/Group.tpl
+++ b/templates/CRM/Custom/Form/Group.tpl
@@ -85,94 +85,105 @@
 {$initHideBlocks}
 {literal}
 <script type="text/Javascript">
+cj(function($) {
 
-showHideStyle( );
-cj('#extends_0').change(function() {
   showHideStyle();
-});
-var  isGroupEmpty = "{/literal}{$isGroupEmpty}{literal}";
+  cj('#extends_0').change(function() {
+    showHideStyle();
+  });
 
-if ( isGroupEmpty ) {
-     showRange( true );
-}
+  var  isGroupEmpty = "{/literal}{$isGroupEmpty}{literal}";
+  if (isGroupEmpty) {
+    showRange(true);
+  }
+  cj('#is_multiple').click(function() {
+    showRange();
+  });
 
-function showHideStyle() {
-  var isShow  = false;
-  var extend  = cj('#extends_0 :selected').val();
+  function showHideStyle() {
+    var isShow  = false;
+    var extend  = cj('#extends_0').val();
 
-  var contactTypes    = {/literal}{$contactTypes}{literal};
-  var showStyle       = "{/literal}{$showStyle}{literal}";
-  var showMultiple    = "{/literal}{$showMultiple}{literal}";
-  var showMaxMultiple = "{/literal}{$showMaxMultiple}{literal}";
+    var contactTypes    = {/literal}{$contactTypes}{literal};
+    var showStyle       = "{/literal}{$showStyle}{literal}";
+    var showMultiple    = "{/literal}{$showMultiple}{literal}";
+    var showMaxMultiple = "{/literal}{$showMaxMultiple}{literal}";
 
-  if (cj.inArray(extend, contactTypes) >= 0) {
-    isShow  = true;
-  }
-  if (isShow) {
-    cj("tr#style").show();
-    cj("tr#is_multiple").show();
-  } else {
-    cj("tr#style").hide();
-    cj("tr#is_multiple").hide();
-    cj("tr#multiple").hide();
-  }
+    if (cj.inArray(extend, contactTypes) >= 0) {
+      isShow  = true;
+    }
 
-  if (showStyle) {
-    cj("tr#style").show();
-  }
+    if (isShow) {
+      cj("tr#style").show();
+      cj("tr#is_multiple").show();
+      if (cj('#is_multiple :checked').length) {
+        cj("tr#multiple").show();
+      }
+    }
+    else {
+      cj("tr#style").hide();
+      cj("tr#is_multiple").hide();
+      cj("tr#multiple").hide();
+    }
 
-  if (showMultiple) {
-    cj("tr#style").show();
-    cj("tr#is_multiple").show();
-  }
+    if (showStyle) {
+      cj("tr#style").show();
+    }
+
+    if (showMultiple) {
+      cj("tr#style").show();
+      cj("tr#is_multiple").show();
+    }
 
-  if (!showMaxMultiple) {
-    cj("tr#multiple").hide();
-  } else if(cj( '#is_multiple').attr('checked')) {
-    cj("tr#multiple").show();
+    if (!showMaxMultiple) {
+      cj("tr#multiple").hide();
+    }
+    else if(cj( '#is_multiple').attr('checked')) {
+      cj("tr#multiple").show();
+    }
   }
-}
 
-function showRange( onFormLoad )
-{
-    if( cj("#is_multiple :checked").length ) {
-        cj("tr#multiple").show();
-        cj("select#style option[value='Tab']").attr("selected", "selected");
-    } else {
-        cj("tr#multiple").hide();
-        if ( !onFormLoad ) {
-            cj("select#style option[value='Inline']").attr("selected", "selected");
-        }
+  function showRange(onFormLoad) {
+    if(cj("#is_multiple :checked").length) {
+      cj("tr#multiple").show();
+      cj("select#style option[value='Tab']").attr("selected", "selected");
     }
-}
+    else {
+      cj("tr#multiple").hide();
+      if (!onFormLoad) {
+        cj("select#style option[value='Inline']").attr("selected", "selected");
+      }
+    }
+  }
 
-// In update mode, when 'extends' is set to an option which doesn't have
-// any options in 2nd selector (for subtypes)  -
-var subtypes = document.getElementById('extends_1');
-if ( subtypes ) {
-     if ( subtypes.options.length <= 0 ) {
-          subtypes.style.display = 'none';
-     } else {
-          subtypes.style.display = 'inline';
-     }
-}
+  // In update mode, when 'extends' is set to an option which doesn't have
+  // any options in 2nd selector (for subtypes)  -
+  var subtypes = document.getElementById('extends_1');
+  if (subtypes) {
+    if (subtypes.options.length <= 0) {
+      subtypes.style.display = 'none';
+    }
+    else {
+      subtypes.style.display = 'inline';
+    }
+  }
+});
 
-function warnDataLoss( )
-{
-   var submittedSubtypes = cj('#extends_1').val();
-   var defaultSubtypes   = {/literal}{$defaultSubtypes}{literal};
+function warnDataLoss() {
+  var submittedSubtypes = cj('#extends_1').val();
+  var defaultSubtypes   = {/literal}{$defaultSubtypes}{literal};
 
-   var warning = false;
-   cj.each(defaultSubtypes, function(index, subtype) {
-      if ( cj.inArray(subtype, submittedSubtypes) < 0 ) {
-         warning = true;
-      }
-   });
+  var warning = false;
+  cj.each(defaultSubtypes, function(index, subtype) {
+    if (cj.inArray(subtype, submittedSubtypes) < 0) {
+      warning = true;
+    }
+  });
 
-   if ( warning ) {
-      return confirm( 'One or more subtypes has been un-selected from the list. Any custom data associated with un-selected subtype would be removed. Click OK to proceed.' );
-   }
-   return true;
+  if (warning) {
+    return confirm( 'One or more subtypes has been un-selected from the list. Any custom data associated with un-selected subtype would be removed. Click OK to proceed.' );
+  }
+  return true;
 }
 </script>
 {/literal}