Dev: Fixed issue regarding ajax and question editing

LimeSurvey · Nov 24, 2017 · a4e599b · a4e599b
1 parent c78b98e
commit a4e599b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/application/config/third_party.php b/application/config/third_party.php
@@ -234,6 +234,7 @@
     // qTip2
     'qTip2' => array(
         'basePath' => 'third_party.qTip2',
+        'position' => CClientScript::POS_BEGIN,
         'js' => array(
             'dist/jquery.qtip.min.js'
         ),

diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
@@ -1084,7 +1084,7 @@ public function newquestion($surveyid)
             $oQuestionGroup = QuestionGroup::model()->find(array('condition'=>'sid=:sid', 'params'=> array(':sid'=>$surveyid), 'order'=>'group_order'));
         }
         $aData['oQuestionGroup'] = $oQuestionGroup;
-        App()->getClientScript()->registerScriptFile(App()->getConfig('adminscripts').'questions.js');
+        App()->getClientScript()->registerScriptFile(App()->getConfig('adminscripts').'questions.js', LSYii_ClientScript::POS_BEGIN);
 
         $aData['adding'] = true;
         $aData['copying'] = false;
@@ -1324,7 +1324,7 @@ public function index($sa, $surveyid, $gid, $qid = null)
                 $oqresult = Question::model()->findAllByAttributes(array('sid' => $surveyid, 'gid' => $gid, 'language' => $baselang, 'parent_qid'=> 0), array('order' => 'question_order'));
                 $aData['oqresult'] = $oqresult;
             }
-            App()->getClientScript()->registerScriptFile(App()->getConfig('adminscripts').'questions.js');
+            App()->getClientScript()->registerScriptFile(App()->getConfig('adminscripts').'questions.js', LSYii_ClientScript::POS_BEGIN);
 
             $aData['sValidateUrl'] = ($adding || $copying) ? $this->getController()->createUrl('admin/questions', array('sa' => 'ajaxValidate', 'surveyid'=>$surveyid)) : $this->getController()->createUrl('admin/questions', array('sa' => 'ajaxValidate', 'surveyid'=>$surveyid, 'qid'=>$qid));
 

diff --git a/assets/packages/adminbasics/js/admin_core.js b/assets/packages/adminbasics/js/admin_core.js
@@ -25,7 +25,7 @@ hasFormValidation= typeof document.createElement( 'input' ).checkValidity == 'fu
 /* See function */
 fixAccordionPosition();
 
-$(document).on('ready  pjax:success', function(){
+$(document).on('ready  pjax:scriptcomplete', function(){
 
     initializeAjaxProgress();
     tableCellAdapters();
@@ -123,19 +123,19 @@ $(document).on('ready  pjax:success', function(){
 
     if ($("#question_type_button").not('.none').length > 0 && $("#question_type_button").attr('type')!='hidden')
     {
-
+        
        qTypeDropdownInit();
         $("#question_type_button").change(function(event){
             OtherSelection(this.value);
         });
-        $("#question_type_button").change();
+        $("#question_type_button").trigger('change');
     }
     else
     {
         $("#question_type.none").change(function(event){
             OtherSelection(this.value);
         });
-        $("#question_type.none").change();
+        $("#question_type.none").trigger('change');
     }
 
     /**

diff --git a/assets/packages/pjax/pjax.js b/assets/packages/pjax/pjax.js
diff --git a/assets/packages/pjax/pjax.min.js b/assets/packages/pjax/pjax.min.js
@@ -227,7 +227,7 @@ Pjax.prototype = {
       }, this)
 
       // Fire Events
-      trigger(document,"pjax:scriptcomplete pjax:success", options)
+      trigger(document,"pjax:complete pjax:success", options)
 
       options.analytics()
 
@@ -988,4 +988,4 @@ module.exports = function(elements, oldElements) {
 }
 
 },{"./foreach-els":7}]},{},[1])(1)
-});
+});
diff --git a/assets/scripts/admin/questions.js b/assets/scripts/admin/questions.js
@@ -26,14 +26,16 @@ $(document).on('ready  pjax:scriptcomplete', function(){
     if($('.loader-advancedquestionsettings').length){
         updatequestionattributes();
     }
+
     $('#question_type').change(updatequestionattributes);
 
     $('#question_type_button  li a').click(function(){
         $(".btn:first-child .buttontext").text($(this).text());
         $('#question_type').val($(this).data('value'));
 
         updatequestionattributes();
-   });
+    });
+
 });
 /**
 * Validate question object on blur on title element

diff --git a/assets/scripts/admin/subquestions.js b/assets/scripts/admin/subquestions.js
@@ -36,9 +36,9 @@ $(document).on('ready  pjax:scriptcomplete', function(){
         update:aftermove,
         distance:3});
 
-    $(document).on("click", '.btnaddanswer', addinput);
-    $(document).on("click", '.btndelanswer', deleteinput);
-    $(document).on("click", '.btnlsbrowser', lsbrowser );
+    $('.btnaddanswer').on("click", addinput);
+    $('.btndelanswer').on("click", deleteinput);
+    $('.btnlsbrowser').on("click", lsbrowser );
 
     //$('.btnaddanswer').click(addinput);
     //$('.btndelanswer').click(deleteinput);