Update to pack javascripts and auto pack them when packaging framework

FreePBX · Dec 13, 2013 · 32b238c · 32b238c
1 parent bb88e49
commit 32b238c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/pack_javascripts.php b/pack_javascripts.php
@@ -44,7 +44,9 @@
 		"|$dir/progress-polyfill.min.js|",
 		"|$dir/jquery-.*\.js|",
 		"|$dir/jquery-ui-.*\.js$|",
-		"|$libfreepbx|"
+		"|$libfreepbx|",
+		"|$dir/bootstrap-.*\.js|",
+		"|html5shiv.js|"
 );
 foreach ($output as $file) {
 

diff --git a/package.php b/package.php
@@ -421,6 +421,13 @@
 	}
 
 	freepbx::out("Done");
+
+	//Package javascript because Andrew always forgets
+	if($module == 'framework') {
+		freepbx::outn("\tFramework, packaging javascripts...");
+		exec('/usr/bin/env php '.dirname(__FILE__).'/pack_javascripts.php');
+		freepbx::out("Done");
+	}
 
 	//GIT Processing here
 	freepbx::out("\tRunning GIT...");