Changeset 12625 for freepbx/branches/2.10/buildtools

Timestamp:

09/21/11 13:17:09 (2 years ago)

Author:

p_lindheimer

Message:

Merged revisions 12624 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/trunk

........

r12624 | mbrevda | 2011-09-21 10:09:35 -0700 (Wed, 21 Sep 2011) | 1 line

re #5342 - fix js packer, remove compression variable - were defaulting to compression for now and can esially do another version that is uncompressed if people have issues

........

Files:

• freepbx/branches/2.10/buildtools/pack_javascripts.php (modified) (3 diffs)

freepbx/branches/2.10/buildtools/pack_javascripts.php

@@ -1 +1 @@
-#!/usr/bin/php -q
-<?php
-
-//include database conifguration 
-$bootstrap_settings['skip_astman'] = true;
-$restrict_mods = true;
-if (!@include_once(getenv('FREEPBX_CONF') ? getenv('FREEPBX_CONF') : '/etc/freepbx.conf')) { 
-      include_once('/etc/asterisk/freepbx.conf'); 
-}
-
-$libfreepbx = '../amp_conf/htdocs/admin/assets/js/pbxlib.js.php';
@@ -21 +14 @@
- * $finalB is then merged with $final, with $finalB being put first
- */  
+
+$skip = array(
+    "|$dir/progress-polyfill.min.js|",
+    "|$dir/jquery-.*\.js|",
+    "|$dir/jquery-ui-.*\.js$|"
+);
-foreach ($output as $file) {
+  
+  //skip the files in the skip array
+  foreach ($skip as $s) {
+    if (preg_match($s, $file)) {
+      continue 2;
+    }
+  }
+  
+  //add files
-  switch(true){
-    case preg_match("|$dir/jquery-.*\.js|",$file)://jquery
-    case 'progress-polyfill.min.js'://no need to minimize - for ie only
-       //$finalB[] = $file;
-    break;
-    case preg_match("|$dir/jquery.cookie.js$|",$file)://jquery ui
-      $finalB[] = $file;
-    break;
-    case preg_match("|$dir/jquery-ui-.*\.js$|",$file)://jquery ui
-      //$finalB[] = $file;
-    break;
-    case $file==$dir.'/script.legacy.js'://legacy script
@@ -52 +53 @@
-header('Expires: ' . date('r', strtotime('+1 year')));
-header('Last-Modified: ' . date('r', strtotime('-1 year')));
-'" . $amp_conf['buffering_callback'] . "'
+ob_gzhandler
-?>
-";