Dev: moved registerScript activateActionLink and activateConfirmButto…

…n to head.twig
LimeSurvey · May 11, 2017 · 40b0aa4 · tammoterhark · May 11, 2017 · 40b0aa4
1 parent 4fbc5a8
commit 40b0aa4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -444,9 +444,7 @@ public function run($surveyid,$args)
         }
 
         // For "clear all" buttons
-        App()->getClientScript()->registerScript("activateConfirmLanguage","$.extend(LSvar.lang,".ls_json_encode(array('yes'=>gT("Yes"),'no'=>gT("No"))).")",CClientScript::POS_BEGIN);
-        App()->getClientScript()->registerScript("activateActionLink","activateActionLink();\n",CClientScript::POS_END);
-        App()->getClientScript()->registerScript("activateConfirmButton","activateConfirmButton();\n",CClientScript::POS_END);
+        $thissurvey['jYesNo'] = ls_json_encode(array('yes'=>gT("Yes"),'no'=>gT("No")));
 
         $thissurvey['aLEM']['debugtimming']['show'] = false;
 
@@ -1600,7 +1598,7 @@ private function manageClearAll()
 
             global $token;
             if($token){
-                $restartparam['token']=sanitize_token($token);
+                $restartparam['token'] = sanitize_token($token);
             }
 
             if (Yii::app()->request->getQuery('lang')){

diff --git a/templates/default/views/subviews/head.twig b/templates/default/views/subviews/head.twig
@@ -15,6 +15,10 @@
     Most of the time, it will not the right place to add your own JS/CSS. Use the config.xml file for that.
 #}
 
+{{ registerScript('activateConfirmLanguage',"$.extend(LSvar.lang," ~ aSurveyInfo.jYesNo ~ ")", "POS_BEGIN") }}
+{{ registerScript('activateActionLink',"activateActionLink();", "POS_END") }}
+{{ registerScript('activateConfirmButton',"activateConfirmButton();", "POS_END") }}
+
 <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />