@@ -74,7 +74,7 @@ class AssetsAutoCompressComponent extends Component implements BootstrapInterfac
74
74
75
75
/**
76
76
* Enables the compilation of files in groups rather than in a single file. Works only when the $cssFileCompile option is enabled
77
- * @var bool
77
+ * @var bool
78
78
*/
79
79
public $ cssFileCompileByGroups = false ;
80
80
@@ -139,10 +139,16 @@ class AssetsAutoCompressComponent extends Component implements BootstrapInterfac
139
139
public $ jsFileCompressFlaggedComments = true ;
140
140
141
141
/**
142
- * Do not connect the js files when all pjax requests.
142
+ * Do not connect the js files when all pjax requests when enabled jsFileCompile
143
143
* @var bool
144
144
*/
145
145
public $ noIncludeJsFilesOnPjax = true ;
146
+
147
+ /**
148
+ * Do not connect the css files when all pjax requests when enabled cssFileCompile
149
+ * @var bool
150
+ */
151
+ public $ noIncludeCssFilesOnPjax = true ;
146
152
/**
147
153
* @var bool|array|string|IFormatter
148
154
*/
@@ -220,8 +226,15 @@ public function bootstrap($app)
220
226
}
221
227
222
228
//TODO:: Think about it
223
- if ($ this ->enabled && $ app ->request ->isPjax && $ this ->noIncludeJsFilesOnPjax ) {
224
- \Yii::$ app ->view ->jsFiles = null ;
229
+ if ($ this ->enabled && $ app ->request ->isPjax ) {
230
+
231
+ if ($ this ->noIncludeJsFilesOnPjax && $ this ->jsFileCompile ) {
232
+ \Yii::$ app ->view ->jsFiles = null ;
233
+ }
234
+
235
+ if ($ this ->noIncludeCssFilesOnPjax && $ this ->cssFileCompile ) {
236
+ \Yii::$ app ->view ->cssFiles = null ;
237
+ }
225
238
}
226
239
});
227
240
@@ -233,10 +246,6 @@ public function bootstrap($app)
233
246
if (!empty ($ response ->data )) {
234
247
$ response ->data = $ this ->_processingHtml ($ response ->data );
235
248
}
236
-
237
- /*if (!empty($response->content)) {
238
- $response->content = $this->_processingHtml($response->content);
239
- }*/
240
249
}
241
250
});
242
251
}
@@ -345,14 +354,14 @@ protected function _processAndGroupJsFiles($files = [])
345
354
346
355
$ result = [];
347
356
$ groupedFiles = $ this ->_getGroupedFiles ($ files );
348
- foreach ($ groupedFiles as $ files )
349
- {
357
+ foreach ($ groupedFiles as $ files ) {
350
358
$ resultGroup = $ this ->_processingJsFiles ($ files );
351
359
$ result = ArrayHelper::merge ($ result , $ resultGroup );
352
360
}
353
-
361
+
354
362
return $ result ;
355
- echo "<pre><code> " . print_r ($ result , true ); die;
363
+ echo "<pre><code> " .print_r ($ result , true );
364
+ die;
356
365
357
366
}
358
367
@@ -366,7 +375,7 @@ public function _getGroupedFiles($files)
366
375
foreach ($ files as $ fileCode => $ fileTag ) {
367
376
list ($ one , $ two , $ key ) = explode ("/ " , $ fileCode );
368
377
369
- $ counter ++;
378
+ $ counter ++;
370
379
371
380
if ($ key != $ lastKey && $ counter > 1 ) {
372
381
$ result [] = $ tmpData ;
@@ -550,7 +559,7 @@ protected function _processingJs($parts)
550
559
551
560
return $ result ;
552
561
}
553
-
562
+
554
563
/**
555
564
* @param array $files
556
565
*/
@@ -562,16 +571,15 @@ protected function _processAndGroupCssFiles($files = [])
562
571
563
572
$ result = [];
564
573
$ groupedFiles = $ this ->_getGroupedFiles ($ files );
565
- foreach ($ groupedFiles as $ files )
566
- {
574
+ foreach ($ groupedFiles as $ files ) {
567
575
$ resultGroup = $ this ->_processingCssFiles ($ files );
568
576
$ result = ArrayHelper::merge ($ result , $ resultGroup );
569
577
}
570
-
578
+
571
579
return $ result ;
572
580
573
581
}
574
-
582
+
575
583
/**
576
584
* @param array $files
577
585
* @return array
0 commit comments