cleared old bs switch files (#3189)

* cleared old bs switch files * delete unnecessary code line
LimeSurvey · Jun 12, 2023 · 7e67e74 · 7e67e74
1 parent 561cfeb
commit 7e67e74
Show file tree

Hide file tree

Showing 26 changed files with 39 additions and 124 deletions.
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js b/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js
@@ -277,7 +277,7 @@ var onClickListAction =  function () {
  * So, when refreshing the grid, the bootstrap-switch must be re-applyed to the elements
  *
  */
-
+// TODO: It seems below two functions are not used and can be deleted. Please confirm.
  function prepareBsSwitchBoolean($gridid){
      // Bootstrap switch with class "bootstrap-switch-boolean" will use the default boolean values.
      // e.g: question mandatory, question other, etc
@@ -304,6 +304,8 @@ function prepareBsSwitchInteger($gridid){
         });
     });
 }
+// =================================================================================
+
 
 function prepareBsDateTimePicker($gridid){
     var dateTimeSettings = getDefaultDateTimePickerSettings();

diff --git a/application/views/admin/dataentry/vvimport.php b/application/views/admin/dataentry/vvimport.php
@@ -55,7 +55,7 @@
                 </div>
             </div>
 
-            <div class="mb-3" id="insertmethod-container">
+            <div class="mb-3 d-none" id="insertmethod-container">
                 <label for="insertmethod" class=" form-label">
                     <?php eT("When an imported record matches an existing record ID:"); ?>
                 </label>
@@ -159,17 +159,19 @@
 
 </div></div></div>
 <?php
-App()->getClientScript()->registerScript('VVImportBSSwitcher', "
-LS.renderBootstrapSwitch();
-
-$('#noid').on('switchChange.bootstrapSwitch', function(event, state) {
-    if (!state){
-        $('#insertmethod').removeAttr('disabled');
-        $('#insertmethod-container').show('slow');
-    }else{
-        $('#insertmethod').attr('disabled','disabled');
-        $('#insertmethod-container').hide('slow');
-    }
+$excludeRecordActive = <<<JAVASCRIPT
+
+$('#noid_1').on('change', function (evt) {
+    $('#insertmethod-container').addClass('d-none');
+    $('#insertmethod').attr('disabled','disabled');
+});
+
+$('#noid_2').on('change', function (evt) {
+    $('#insertmethod-container').removeClass('d-none');
+    $('#insertmethod').removeAttr('disabled');
 });
-", LSYii_ClientScript::POS_POSTSCRIPT);
-?>
+JAVASCRIPT;
+
+
+App()->getClientScript()->registerScript('VVImportBS5Switcher', $excludeRecordActive, LSYii_ClientScript::POS_POSTSCRIPT);
+?>
diff --git a/application/views/admin/export/exportresults_view.php b/application/views/admin/export/exportresults_view.php
@@ -43,7 +43,7 @@
                     <?php $this->renderPartial('/admin/export/exportresult_panels/_general', ['selecthide'  => $selecthide, 'selectshow'  => $selectshow, 'selectinc'  => $selectinc, 'aLanguages'  => $aLanguages]); ?>
 
                     <?php if (empty(App()->getRequest()->getParam('responseIds'))) : ?>
-                           <?php $this->renderPartial('/admin/export/exportresult_panels/_range', ['SingleResponse' => $SingleResponse, 'min_datasets' => $min_datasets, 'max_datasets' => $max_datasets]); ?>
+                        <?php $this->renderPartial('/admin/export/exportresult_panels/_range', ['SingleResponse' => $SingleResponse, 'min_datasets' => $min_datasets, 'max_datasets' => $max_datasets]); ?>
                     <?php else : ?>
                         <?php $this->renderPartial('/admin/export/exportresult_panels/_single-value', ['SingleResponse' => $SingleResponse, 'surveyid' => $surveyid]); ?>
                     <?php endif; ?>
@@ -63,11 +63,6 @@
             </div>
         </div>
     </div>
-    <input type='submit' class="btn btn-outline-secondary d-none" value='<?php eT("Export data");?>' id='exportresultsubmitbutton' />
+    <input type='submit' class="btn btn-outline-secondary d-none" value='<?php eT("Export data"); ?>' id='exportresultsubmitbutton' />
     </form>
-</div>
-<?php
-App()->getClientScript()->registerScript('ExportResultsBSSwitcher', "
-LS.renderBootstrapSwitch();
-", LSYii_ClientScript::POS_POSTSCRIPT);
-?>
+</div>
diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php
@@ -100,8 +100,3 @@
         </div>
     </div>
 </div>
-<?php
-App()->getClientScript()->registerScript('StatisticsViewBSSwitcher', "
-LS.renderBootstrapSwitch();
-", LSYii_ClientScript::POS_POSTSCRIPT);
-?>
diff --git a/application/views/admin/globalsettings/globalSettings_view.php b/application/views/admin/globalsettings/globalSettings_view.php
@@ -5,9 +5,6 @@
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('globalsettings');
-
-App()->getClientScript()->registerScript('GlobalSettingsBSSwitcher', "LS.renderBootstrapSwitch();", LSYii_ClientScript::POS_POSTSCRIPT);
-
 ?>
 <script type="text/javascript">
     var msgCantRemoveDefaultLanguage = '<?php eT("You can't remove the default language.", 'js'); ?>';
@@ -95,4 +92,4 @@
     <input type='hidden' name='action' value='globalsettingssave'/>
     <input type='submit' class="d-none"/>
     <?php echo CHtml::endForm() ?>
-</div>
+</div>
diff --git a/application/views/admin/globalsettings/surveySettings.php b/application/views/admin/globalsettings/surveySettings.php
@@ -107,8 +107,6 @@
 </div>
 
 <script>
-    window.LS.unrenderBootstrapSwitch();
-    window.LS.renderBootstrapSwitch();
 
     $('#surveySettings a').click(function (e) {
         window.location.hash = $(this).attr('href');

diff --git a/application/views/admin/participants/modal_subviews/_editAttribute.php b/application/views/admin/participants/modal_subviews/_editAttribute.php
@@ -237,7 +237,7 @@
         });
         jQuery(function(){jQuery('#ParticipantAttributeName_attribute_type').trigger('change');});
 
-        LS.renderBootstrapSwitch();
+
     </script>
 </div>
 <div class="modal-footer">
@@ -248,4 +248,4 @@
 </div>
 <?php
 $this->endWidget();
-?>
+?>
diff --git a/application/views/admin/participants/modal_subviews/_editParticipant.php b/application/views/admin/participants/modal_subviews/_editParticipant.php
@@ -140,9 +140,7 @@
         <?php echo $buttonTitle; ?>
     </button>
 </div>
-<script>
-$('#editPartcipantActiveForm .bootstrap-switch').bootstrapSwitch();
-</script>
+
 <?php
 $this->endWidget();
-?>
+?>
diff --git a/application/views/admin/participants/participantsPanel_view.php b/application/views/admin/participants/participantsPanel_view.php
@@ -71,11 +71,4 @@
 <?php
 $aModalData = ['aAttributes' => $aAttributes];
 App()->getController()->renderPartial('/admin/participants/modal_subviews/_exportCSV', $aModalData);
-
-App()->getClientScript()->registerScript(
-    'ParticipantsPanelBSSwitcher',
-    "LS.renderBootstrapSwitch();",
-    LSYii_ClientScript::POS_POSTSCRIPT
-);
 ?>
-
diff --git a/application/views/admin/survey/queXMLSurvey_view.php b/application/views/admin/survey/queXMLSurvey_view.php
@@ -225,9 +225,4 @@
             </div>
          </div>
     </div>
-</div>
-<?php
-App()->getClientScript()->registerScript('QueXMLExportBSSwitcher', "
-LS.renderBootstrapSwitch();
-", LSYii_ClientScript::POS_POSTSCRIPT);
-?>
+</div>
diff --git a/application/views/admin/surveysgroups/surveySettings.php b/application/views/admin/surveysgroups/surveySettings.php
@@ -119,9 +119,7 @@
     <?php
     Yii::app()->getClientScript()->registerScript(
         "editLocalSettings_submit",
-        "window.LS.unrenderBootstrapSwitch();
-        window.LS.renderBootstrapSwitch();
-    
+        "
         $('#surveySettings a').click(function (e) {
             window.location.hash = $(this).attr('href');
             e.preventDefault();
@@ -152,4 +150,4 @@
         LSYii_ClientScript::POS_POSTSCRIPT
     );
     ?>
-</div>
+</div>
diff --git a/application/views/admin/token/csvupload.php b/application/views/admin/token/csvupload.php
@@ -159,11 +159,4 @@
             ?>
         </div>
     </div>
-</div>
-<?php
-App()->getClientScript()->registerScript('CSVUploadViewBSSwitcher',
-    "
-LS.renderBootstrapSwitch();
-",
-    LSYii_ClientScript::POS_POSTSCRIPT);
-?>
+</div>
diff --git a/application/views/admin/token/exportdialog.php b/application/views/admin/token/exportdialog.php
@@ -150,11 +150,4 @@
         </div>
     </div>
 </div>
-
-
-</div>
-<?php
-App()->getClientScript()->registerScript('ExportDialogViewBSSwitcher', "
-LS.renderBootstrapSwitch();
-", LSYii_ClientScript::POS_POSTSCRIPT);
-?>
+</div>
diff --git a/application/views/admin/token/invite.php b/application/views/admin/token/invite.php
@@ -174,9 +174,8 @@
 <?php
 
 App()->getClientScript()->registerScript("Tokens:BindInviteView", "
-        LS.renderBootstrapSwitch();
         $('#send-invitation-button').on('click', function(){
             $('#sendinvitation').submit();
         })
 ", LSYii_ClientScript::POS_POSTSCRIPT ); 
-?>
+?>
diff --git a/application/views/admin/token/managetokenattributes.php b/application/views/admin/token/managetokenattributes.php
@@ -208,9 +208,4 @@
                 <?php } ?>
         </div>
     </div>
-</div>
-<?php
-App()->getClientScript()->registerScript('ManageTokenAttributesViewBSSwitcher', "
-LS.renderBootstrapSwitch();
-", LSYii_ClientScript::POS_POSTSCRIPT);
-?>
+</div>
diff --git a/application/views/admin/token/massive_actions/_update.php b/application/views/admin/token/massive_actions/_update.php
@@ -381,15 +381,6 @@
 
 
 <?php App()->getClientScript()->registerScript("Tokens:MassActionUpdateView_Scripts", "
-
-   var bindBSSwitch = function(formGroup){
-       console.log(\"bindBSSwitch run on:\",formGroup);
-       //Script to update the completed settings
-       formGroup.find('.YesNoSwitch').on('switchChange.bootstrapSwitch', function(e, state){        
-           formGroup.find('.selector_datechange').css('display', (state ? '' : 'none'));
-       });
-   };
-
    var bindDatepicker = function(myFormGroup){
     myFormGroup.find('.action_datepickerUpdateHiddenField').on('change dp.change', function(){
         myFormGroup.find('.selector_submitField').val($(this).val());
@@ -422,7 +413,6 @@
             myFormGroup.find('.selector_submitField').val('lskeep');
         } else {
             myFormGroup.find('.selector_submitField').val('');
-            bindBSSwitch(myFormGroup);
             bindDatepicker(myFormGroup);
         }
         

diff --git a/application/views/admin/token/remind.php b/application/views/admin/token/remind.php
@@ -192,7 +192,6 @@
 
         <?php
         App()->getClientScript()->registerScript("Tokens:BindReminderView", "
-        LS.renderBootstrapSwitch();
         $('#send-reminders-button').on('click', function(){
             $('#sendreminder').submit();
         })

diff --git a/application/views/admin/token/tokenform.php b/application/views/admin/token/tokenform.php
@@ -508,14 +508,6 @@ class='form-control<?= $attr_description['mandatory'] == 'Y' ? ' mandatory-attri
         </div>
     </div>
 </div>
-<?php
-App()->getClientScript()->registerScript('TokenformViewBSSwitcher',
-    "
-LS.renderBootstrapSwitch();
-",
-    LSYii_ClientScript::POS_POSTSCRIPT
-);
-?>
 
 <?php if ($token_subaction == "addnew"): ?>
     <!-- Empty Token Confirmation Modal -->

diff --git a/application/views/surveyAdministration/editLocalSettings_main_view.php b/application/views/surveyAdministration/editLocalSettings_main_view.php
@@ -68,8 +68,6 @@
 
 App()->getClientScript()->registerScript("editLocalSettings_submit_" . $entryData['name'],
     "
-window.LS.unrenderBootstrapSwitch();
-window.LS.renderBootstrapSwitch();
 
 $('#" . $entryData['name'] . "').off('.editLocalsettings');
 

diff --git a/assets/admin_themes/adminbasics_temporary/000-lime-admin-common.scss b/assets/admin_themes/adminbasics_temporary/000-lime-admin-common.scss
@@ -2133,10 +2133,6 @@ table#responsedetail tr td {
     margin-bottom: 30px;
 }
 
-#insertmethod-container {
-    display: none;
-}
-
 
 /* Some printing optimization */
 @media print {

diff --git a/assets/packages/adminbasics/src/parts/globalMethods.js b/assets/packages/adminbasics/src/parts/globalMethods.js
@@ -5,6 +5,7 @@
 import LOG from '../components/lslog';
 
 const globalWindowMethods = {
+    // TODO: It seems below two functions are not used and can be deleted. Please confirm.
     renderBootstrapSwitch : () => {
         try{
             if(!$('[data-is-bootstrap-switch]').parent().hasClass('bootstrap-switch-container')) {
@@ -19,6 +20,7 @@ const globalWindowMethods = {
             $('[data-is-bootstrap-switch]').bootstrapSwitch('destroy');
         } catch(e) { LOG.error(e); }
     },
+    // ==================================================================================
     validatefilename: (form, strmessage) => {
         if (form.the_file.value == "") {
             $('#pleaseselectfile-popup').modal();
@@ -158,4 +160,4 @@ const globalStartUpMethods = {
 };
 
 
-export {globalStartUpMethods, globalWindowMethods};
+export {globalStartUpMethods, globalWindowMethods};
diff --git a/modules/admin/globalsettings/views/globalSettings_view.php b/modules/admin/globalsettings/views/globalSettings_view.php
@@ -6,13 +6,6 @@
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('globalsettings');
 
-App()->getClientScript()->registerScript('GlobalSettingsBSSwitcher',
-    "
-LS.renderBootstrapSwitch();
-",
-    LSYii_ClientScript::POS_POSTSCRIPT
-);
-
 ?>
 <script type="text/javascript">
     var msgCantRemoveDefaultLanguage = '<?php eT("You can't remove the default language.", 'js'); ?>';

diff --git a/themes/admin/Sea_Green/css/sea_green-rtl.css b/themes/admin/Sea_Green/css/sea_green-rtl.css
@@ -13371,10 +13371,6 @@ table#responsedetail tr td {
   margin-bottom: 30px;
 }
 
-#insertmethod-container {
-  display: none;
-}
-
 /* Some printing optimization */
 @media print {
   html, body {

diff --git a/themes/admin/Sea_Green/css/sea_green-rtl.min.css b/themes/admin/Sea_Green/css/sea_green-rtl.min.css
diff --git a/themes/admin/Sea_Green/css/sea_green.css b/themes/admin/Sea_Green/css/sea_green.css
@@ -13394,10 +13394,6 @@ table#responsedetail tr td {
   margin-bottom: 30px;
 }
 
-#insertmethod-container {
-  display: none;
-}
-
 /* Some printing optimization */
 @media print {
   html, body {

diff --git a/themes/admin/Sea_Green/css/sea_green.min.css b/themes/admin/Sea_Green/css/sea_green.min.css