Dev: removed double definition of JS vars

LimeSurvey · May 11, 2017 · 3879105 · 3879105
1 parent 1a1221c
commit 3879105
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -17,21 +17,6 @@ class index extends CAction {
 
     public function run()
     {
-        // Ensure to set some var, but script are replaced in SurveyRuntimeHelper
-        $aLSJavascriptVar                  = array();
-        $aLSJavascriptVar['bFixNumAuto']   = (int)(bool)Yii::app()->getConfig('bFixNumAuto',1);
-        $aLSJavascriptVar['bNumRealValue'] = (int)(bool)Yii::app()->getConfig('bNumRealValue',0);
-        $aLangData                         = getLanguageData();
-        $aRadix                            = getRadixPointData($aLangData[ Yii::app()->getConfig('defaultlang')]['radixpoint']);
-        $aLSJavascriptVar['sLEMradix']     = $aRadix['separator'];
-        $aLSJavascriptVar['lang']          = new stdClass;
-        $aLSJavascriptVar['showpopup']     = (int)Yii::app()->getConfig('showpopups');
-        $aLSJavascriptVar['startPopup']    = new stdClass;
-        $sLSJavascriptVar                  = "LSvar=".json_encode($aLSJavascriptVar) . ';';
-
-        App()->clientScript->registerScript('sLSJavascriptVar',$sLSJavascriptVar,CClientScript::POS_HEAD);
-        App()->clientScript->registerScript('setJsVar',"setJsVar();",CClientScript::POS_BEGIN);// Ensure all js var is set before rendering the page (User can click before $.ready)
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."survey_runtime.js");
         useFirebug();
         $this->action();
     }

diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -1325,21 +1325,17 @@ public function setJavascriptVar($iSurveyId='')
 
         if(isset($aSurveyinfo['surveyls_numberformat'])){
             $aLSJavascriptVar                  = array();
-
             $aLSJavascriptVar['bFixNumAuto']   = (int)(bool)Yii::app()->getConfig('bFixNumAuto',1);
             $aLSJavascriptVar['bNumRealValue'] = (int)(bool)Yii::app()->getConfig('bNumRealValue',0);
-
             $aRadix                            = getRadixPointData($aSurveyinfo['surveyls_numberformat']);
             $aLSJavascriptVar['sLEMradix']     = $aRadix['separator'];
-
             $aLSJavascriptVar['lang']          = new stdClass; // To add more easily some lang string here
             $aLSJavascriptVar['showpopup']     = (int)Yii::app()->getConfig('showpopups');
-
             $aLSJavascriptVar['startPopups']   = new stdClass;
             $sLSJavascriptVar                  = "LSvar=".json_encode($aLSJavascriptVar) . ';';
-
-            $sLSJavascriptVar="LSvar=".json_encode($aLSJavascriptVar) . ';';
+            $sLSJavascriptVar                  = "LSvar=".json_encode($aLSJavascriptVar) . ';';
             App()->clientScript->registerScript('sLSJavascriptVar',$sLSJavascriptVar,CClientScript::POS_HEAD);
+            App()->clientScript->registerScript('setJsVar',"setJsVar();",CClientScript::POS_BEGIN);                 // Ensure all js var is set before rendering the page (User can click before $.ready)
         }
     }