Dev: Fix (partial : public part only) merging issue

Dev: #11918 : remove jqueryui from template config.xml, add it to do_ranking Dev: create config/packages.php for core packages
LimeSurvey · Nov 16, 2016 · cd8244b · cd8244b
1 parent 4ecf385
commit cd8244b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -98,20 +98,7 @@
         'clientScript'=>array(
             'packages' => array_merge(
                 require('third_party.php'),
-                array(
-                    'limesurvey-public'=>array(
-                        'basePath' => 'core.limesurvey',
-                        'css'=> array(
-                            'survey.css',
-                        ),
-                        'js'=>array(
-                            'survey.js',
-                        ),
-                        'depends' => array(
-                            'bootstrap',
-                        )
-                    )
-                )
+                require('packages.php')
             )
         ),
 

diff --git a/application/config/packages.php b/application/config/packages.php
@@ -0,0 +1,22 @@
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Core packages , no third_party
+ *
+ * @license GPL v3
+ *
+ */
+return array(
+    /* For public template functionnality */
+    'limesurvey-public'=>array(
+        'basePath' => 'core.limesurvey',
+        'css'=> array(
+            'survey.css',
+        ),
+        'js'=>array(
+            'survey.js',
+        ),
+        'depends' => array(
+            //'bootstrap',
+        )
+    )
+);
diff --git a/application/config/third_party.php b/application/config/third_party.php
@@ -5,7 +5,8 @@
  * Defining them here allows for easy inclusion in views.
  */
 
-
+/* Please : comment the reason, mantis bug link: ajax don't need any package if i don't make error */
+/* Ajax must renderPartial (better : always return json) and never render and don't registerScript (IMHO) / Shnoulle on 2016-11-16 */
 if (!isset($_GET['isAjax']))
 {
     $aJquery = array(
@@ -303,6 +304,7 @@
         'css' => array(
             'css/emoji.css',
             'css/ss-emoji.css'
+        ),
     ),
     'jquery-datatable' => array(
         'basePath' => 'third_party.jquery-datatable',
@@ -317,6 +319,4 @@
             'bootstrap'
         )
     )
-
-
 );
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -2074,7 +2074,10 @@ function do_ranking($ia)
         $inputnames[]=$myfname;
     }
 
+    App()->getClientScript()->registerPackage('jqueryui');
+    App()->getClientScript()->registerPackage('jquery-touch-punch');
     App()->getClientScript()->registerPackage('jquery-actual'); // Needed to with jq1.9 ?
+
     Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."ranking.js");
     Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . "ranking.css");
 

diff --git a/templates/default/config.xml b/templates/default/config.xml
@@ -112,8 +112,10 @@
         <!-- Here, you can publish packages set as third party extensions in application/config/third_party -->
         <!-- If bootstrap is registered as a css framework, it will be loaded first -->
         <packages>
+<!--
             <package>jqueryui</package>
             <package>jquery-touch-punch</package>
+-->
             <package>fontawesome</package>
             <package>limesurvey-public</package>
         </packages>