fixed out of sync minified version of jquery.combobox.js by removing …

…minified files for plugin javascripts from the git repository and adding them to the generation process in the pom
sdutry · Dec 18, 2016 · 11c858f · 11c858f
1 parent d3fa6a8
commit 11c858f
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 135 deletions.
diff --git a/struts2-jquery-plugin/.gitignore b/struts2-jquery-plugin/.gitignore
@@ -56,3 +56,11 @@ src/main/resources/template/js/base/widget.min.js
 /src/main/resources/template/js/base/checkboxradio.min.js
 /src/main/resources/template/js/base/form-reset-mixin.min.js
 /src/main/resources/template/i18n/jquery-ui-timepicker-*.min.js
+
+src/main/resources/template/js/base/jquery-ui-timepicker-addon.js
+src/main/resources/template/js/base/jquery.ba-bbq.js
+src/main/resources/template/js/base/jquery.combobox.js
+src/main/resources/template/js/base/jquery.form.js
+src/main/resources/template/js/base/jquery.mousewheel.js
+src/main/resources/template/js/base/jquery.subscribe.js
+
diff --git a/struts2-jquery-plugin/pom.xml b/struts2-jquery-plugin/pom.xml
@@ -178,6 +178,31 @@
                             <goal>minify</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>plugin-minify</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <charset>UTF-8</charset>
+                            <jsEngine>CLOSURE</jsEngine>
+                            <closureLanguage>ECMASCRIPT5_STRICT</closureLanguage>
+                            <skipMerge>true</skipMerge>
+                            <webappSourceDir>${basedir}/src/main/resources</webappSourceDir>
+                            <webappTargetDir>${basedir}/src/main/resources</webappTargetDir>
+			    <jsSourceDir>template/js/plugins</jsSourceDir>
+                            <jsTargetDir>template/js/plugins</jsTargetDir>
+                            <jsSourceFiles>
+                                <jsSourceFile>jquery-ui-timepicker-addon.js</jsSourceFile>
+                                <jsSourceFile>jquery.ba-bbq.js</jsSourceFile>
+                                <jsSourceFile>jquery.combobox.js</jsSourceFile>
+                                <jsSourceFile>jquery.form.js</jsSourceFile>
+                                <jsSourceFile>jquery.mousewheel.js</jsSourceFile>
+                                <jsSourceFile>jquery.subscribe.js</jsSourceFile>
+                            </jsSourceFiles>
+                        </configuration>
+                        <goals>
+                            <goal>minify</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>

diff --git a/...s2-jquery-plugin/src/main/resources/template/js/plugins/jquery-ui-timepicker-addon.min.js b/...s2-jquery-plugin/src/main/resources/template/js/plugins/jquery-ui-timepicker-addon.min.js
diff --git a/struts2-jquery-plugin/src/main/resources/template/js/plugins/jquery.ba-bbq.min.js b/struts2-jquery-plugin/src/main/resources/template/js/plugins/jquery.ba-bbq.min.js
diff --git a/struts2-jquery-plugin/src/main/resources/template/js/plugins/jquery.combobox.min.js b/struts2-jquery-plugin/src/main/resources/template/js/plugins/jquery.combobox.min.js