Skip to content

Commit

Permalink
utilize dev
Browse files Browse the repository at this point in the history
  • Loading branch information
tm1000 committed Feb 21, 2018
1 parent cf51d2e commit cbabdd0
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions pack_javascripts.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
$output=array();

exec("ls $dir/*.js",$output,$ret);
if(file_exists("$dir/bootstrap-table-extensions-1.11.0/")) {
exec("ls $dir/bootstrap-table-extensions-1.11.0/*.js",$output2,$ret);
if(file_exists("$dir/bootstrap-table-extensions-dev/")) {
exec("ls $dir/bootstrap-table-extensions-dev/*.js",$output2,$ret);
$output = array_merge($output,$output2);
}
$final=$finalB=array();
Expand Down Expand Up @@ -100,6 +100,7 @@
"|$dir/recorderWorker\.js|",
"|$dir/moment-with-locales\.min\.js|",
"|$dir/moment-timezone\.min\.js|",
"|$dir/moment-duration-format-\.js|",
"|$dir/browser-locale\.min\.js|"
);
} else {
Expand Down Expand Up @@ -146,6 +147,9 @@
} else {
//add files
switch(true){
case preg_match("|$dir/moment-duration-format-.*\.js|",$file):
$finalB[] = $file;
break;
case preg_match("|$dir/moment-with-locales-.*\.min\.js|",$file):
$finalB[] = $file;
break;
Expand Down

0 comments on commit cbabdd0

Please sign in to comment.