From a4e599b936a52f9477f19186a931e1aedaeb32c8 Mon Sep 17 00:00:00 2001 From: markusfluer Date: Fri, 24 Nov 2017 18:22:21 +0100 Subject: [PATCH] Dev: Fixed issue regarding ajax and question editing --- application/config/third_party.php | 1 + application/controllers/admin/questions.php | 4 ++-- assets/packages/adminbasics/js/admin_core.js | 8 ++++---- assets/packages/pjax/pjax.js | 2 +- assets/packages/pjax/pjax.min.js | 4 ++-- assets/scripts/admin/questions.js | 4 +++- assets/scripts/admin/subquestions.js | 6 +++--- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/application/config/third_party.php b/application/config/third_party.php index b796d69666b..1b78a194d09 100755 --- 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 index 5048f79f4f9..8e49ee91c5f 100644 --- 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 index 0d59a236d19..eaa9af1df05 100644 --- 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 index 1519eb9d5ef..5f92ab31c28 100644 --- a/assets/packages/pjax/pjax.js +++ b/assets/packages/pjax/pjax.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() diff --git a/assets/packages/pjax/pjax.min.js b/assets/packages/pjax/pjax.min.js index c8097774914..d7490ffec2a 100644 --- 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) -}); \ No newline at end of file +}); diff --git a/assets/scripts/admin/questions.js b/assets/scripts/admin/questions.js index 514726fbb97..20d51fba961 100644 --- a/assets/scripts/admin/questions.js +++ b/assets/scripts/admin/questions.js @@ -26,6 +26,7 @@ $(document).on('ready pjax:scriptcomplete', function(){ if($('.loader-advancedquestionsettings').length){ updatequestionattributes(); } + $('#question_type').change(updatequestionattributes); $('#question_type_button li a').click(function(){ @@ -33,7 +34,8 @@ $(document).on('ready pjax:scriptcomplete', function(){ $('#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 index 755b71acd8b..eab52a1f473 100644 --- 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);