Fixed issue #09859: Broken javascript with thousands_separator

Dev: add third_party Dev: Fix script link call
LimeSurvey · Sep 1, 2015 · 063a3bc · 063a3bc
1 parent e94e67d
commit 063a3bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/application/config/third_party.php b/application/config/third_party.php
@@ -223,6 +223,12 @@
             'jqueryui'
         )
     ),
+    'jquery-price-format' => array(
+        'baseUrl' => 'third_party/jquery-price-format/',
+        'js' => array(
+            'jquery_price_format.js'
+        ),
+    ),
     'leaflet' => array(
         'baseUrl' => 'third_party/leaflet/',
         'js' => array(

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -3061,7 +3061,7 @@ function do_multiplenumeric($ia)
     $extraclass .=" numberonly";
     if ($aQuestionAttributes['thousands_separator'] == 1) {
         App()->clientScript->registerPackage('jquery-price-format');
-        App()->clientScript->registerScriptFile('scripts/numerical_input.js');
+        App()->clientScript->registerScriptFile(Yii::app()->getConfig('generalscripts').'numerical_input.js');
         $extraclass .= " thousandsseparator";
     }
 
@@ -3324,7 +3324,7 @@ function do_numerical($ia)
     }
     if ($aQuestionAttributes['thousands_separator'] == 1) {
         App()->clientScript->registerPackage('jquery-price-format');
-        App()->clientScript->registerScriptFile('scripts/numerical_input.js');
+        App()->clientScript->registerScriptFile(Yii::app()->getConfig('generalscripts').'numerical_input.js');
         $extraclass .= " thousandsseparator";
     }
     if (trim($aQuestionAttributes['suffix'][$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']])!='') {