Add new sub feature: JS Minify

t3framework · Jan 20, 2014 · 74da444 · 74da444
1 parent 03c0d78
commit 74da444
Show file tree

Hide file tree

Showing 8 changed files with 8,558 additions and 37 deletions.
diff --git a/source/plg_system_t3/base-bs3/js/less.unmin.js b/source/plg_system_t3/base-bs3/js/less.unmin.js
diff --git a/source/plg_system_t3/base-bs3/params/template.xml b/source/plg_system_t3/base-bs3/params/template.xml
@@ -6,12 +6,15 @@
 			<field name="t3_template" type="hidden" default="1" value="1"/>
 
 			<field name="general_params_default" type="t3depend" function="@group">
-				<option for="devmode" value="0">
-					minify
+				<option for="devmode" value="0" hide="0">
+					minify, minify_js
 				</option>
 				<option for="responsive" value="0">
 					non_responsive_width
 				</option>
+				<option for="minify_js" value="1">
+					minify_js_tool, minify_exclude
+				</option>
 			</field>
 
 			<field name="devmode" type="radio" default="0"
@@ -59,14 +62,6 @@
 				<option value="1" class="on">JYES</option>
 			</field>
 
-			<field name="minify" type="radio" default="0"
-				   global="1"
-				   label="T3_GENERAL_ASSETS_MINIFY_LABEL"
-				   description="T3_GENERAL_ASSETS_MINIFY_DESC">
-				<option value="0" class="off">JNO</option>
-				<option value="1" class="on">JYES</option>
-			</field>
-
 			<field name="t3-assets" type="text" default="t3-assets"
 				   global="1"
 				   label="T3_GENERAL_ASSETS_FOLDER_LABEL"
@@ -80,6 +75,37 @@
 				<option value="1" class="on">JYES</option>
 			</field>
 
+			<field type="t3depend" function="@legend" label="T3_GENERAL_OPTIMIZE_LABEL" description="T3_GENERAL_OPTIMIZE_DESC" />
+
+			<field name="minify" type="radio" default="0"
+				   global="1"
+				   label="T3_GENERAL_ASSETS_MINIFY_LABEL"
+				   description="T3_GENERAL_ASSETS_MINIFY_DESC">
+				<option value="0" class="off">JNO</option>
+				<option value="1" class="on">JYES</option>
+			</field>
+
+			<field name="minify_js" type="radio" default="0"
+				   global="1"
+				   label="T3_GENERAL_ASSETS_MINIFYJS_LABEL"
+				   description="T3_GENERAL_ASSETS_MINIFYJS_DESC">
+				<option value="0" class="off">JNO</option>
+				<option value="1" class="on">JYES</option>
+			</field>
+
+			<field name="minify_js_tool" type="list" default="jsmin"
+				   global="1"
+				   label="T3_GENERAL_ASSETS_MINIFYJS_TOOL_LABEL"
+				   description="T3_GENERAL_ASSETS_MINIFYJS_TOOL_DESC">
+				<option value="jsmin">T3_GENERAL_ASSETS_MINIFYJS_TOOL_JSMIN</option>
+				<option value="closurecompiler">T3_GENERAL_ASSETS_MINIFYJS_TOOL_CLOSURE</option>
+			</field>
+
+			<field name="minify_exclude" type="text" default=""
+				   global="1"
+				   label="T3_GENERAL_ASSETS_MINIFYJS_EXCLUDE_LABEL"
+				   description="T3_GENERAL_ASSETS_MINIFYJS_EXCLUDE_DESC" />
+
 		</fieldset>
 
 		<fieldset name="theme_params" label="T3_THEME_LABEL" description="T3_THEME_DESC">

diff --git a/source/plg_system_t3/base/params/template.xml b/source/plg_system_t3/base/params/template.xml
@@ -7,7 +7,11 @@
 
 			<field name="general_params_default" type="t3depend" function="@group">
 				<option for="devmode" value="0">
-					minify
+					minify, minify_js
+				</option>
+
+				<option for="minify_js" value="1">
+					minify_js_tool
 				</option>
 			</field>
 
@@ -51,6 +55,22 @@
 				<option value="1">JYES</option>
 			</field>
 
+			<field name="minify_js" type="radio" default="0"
+				   global="1"
+				   label="T3_GENERAL_ASSETS_MINIFYJS_LABEL"
+				   description="T3_GENERAL_ASSETS_MINIFYJS_DESC">
+				<option value="0" class="off">JNO</option>
+				<option value="1" class="on">JYES</option>
+			</field>
+
+			<field name="minify_js_tool" type="list" default="jsmin"
+				   global="1"
+				   label="T3_GENERAL_ASSETS_MINIFYJS_TOOL_LABEL"
+				   description="T3_GENERAL_ASSETS_MINIFYJS_TOOL_DESC">
+				<option value="jsmin">T3_GENERAL_ASSETS_MINIFYJS_TOOL_JSMIN</option>
+				<option value="closurecompiler">T3_GENERAL_ASSETS_MINIFYJS_TOOL_CLOSURE</option>
+			</field>
+
 			<field name="t3-assets" type="text" default="t3-assets"
 				global="1"
 				label="T3_GENERAL_ASSETS_FOLDER_LABEL"
@@ -80,7 +100,7 @@
 				filter=".*"
 				directory="less/themes"
 				stripext="true"
-				hide_none="false" />
+				hide_none="true" />
 
 			<field name="logotype" type="list" default="image"
 				label="T3_THEME_LOGOTYPE_LABEL"
@@ -121,7 +141,7 @@
 				filter=".*\.php"
 				directory="tpls"
 				stripext="true"
-				hide_none="false"
+				hide_none="true"
 				hide_default="true"
 			/>