Dev: split up pjax and pjax combined

LimeSurvey · Dec 14, 2017 · e6d0dfa · e6d0dfa
1 parent 53c3715
commit e6d0dfa
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/application/config/packages.php b/application/config/packages.php
@@ -137,13 +137,25 @@
         'js' => ($debug > 0 ?
             array(
                 'pjax.js',
-                'loadPjax.js'
             ) 
             : array(
                 'min/pjax.min.js',
             )
         ),
     ),
+    'pjaxbackend' => array(
+        'devBaseUrl' => 'assets/packages/pjax/',
+        'basePath' => 'core.pjax',
+        'js' => ($debug > 0 ?
+            array(
+                'pjax.js',
+                'loadPjax.js'
+            ) 
+            : array(
+                'min/pjax.combined.min.js',
+            )
+        ),
+    ),
     'adminpanel' => array(
         'devBaseUrl' => 'assets/packages/adminpanel/',
         'basePath' => 'core.adminpanel',
@@ -199,7 +211,7 @@
         ),
         'depends' => array(
             'jquery',
-            'pjax',
+            'pjaxbackend',
             'lslog',
         )
     ),
@@ -222,7 +234,7 @@
         ),
         'depends' => array(
             'jquery',
-            'pjax',
+            'pjaxbackend',
         )
     ),
 
@@ -238,7 +250,7 @@
         ),
         'depends' => array(
             'jquery',
-            'pjax',
+            'pjaxbackend',
         )
     ),
 

diff --git a/assets/packages/pjax/build.sh b/assets/packages/pjax/build.sh
@@ -1 +1,2 @@
-cat pjax.js loadPjax.js | uglifyjs --compress > min/pjax.min.js
+cat pjax.js loadPjax.js | uglifyjs --compress > min/pjax.combined.min.js
+cat pjax.js | uglifyjs --compress > min/pjax.min.js
diff --git a/assets/packages/pjax/min/pjax.combined.min.js b/assets/packages/pjax/min/pjax.combined.min.js
diff --git a/assets/packages/pjax/min/pjax.min.js b/assets/packages/pjax/min/pjax.min.js
diff --git a/themes/survey/vanilla/config.xml b/themes/survey/vanilla/config.xml
@@ -74,6 +74,7 @@
         <!-- If bootstrap is registered as a css framework, it will be loaded first -->
         <packages>
             <add>pjax</add>
+            <add>lslog</add>
             <add>font-noto</add>
             <add>moment</add>
         </packages>