Merge branch 'release/4.0.2' of https://github.com/struts-community-p…

…lugins/struts2-jquery into issue90
struts-community-plugins · Dec 31, 2016 · b8258ae · b8258ae
2 parents 0044589 + aa7d8db
commit b8258ae
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 175 deletions.
diff --git a/struts2-jquery-grid-plugin/src/main/resources/template/js/struts2/jquery.grid.struts2.js b/struts2-jquery-grid-plugin/src/main/resources/template/js/struts2/jquery.grid.struts2.js
@@ -285,8 +285,8 @@
 								"js/base/safe-active-element" + self.minSuffix + ".js",
 								"js/base/safe-blur" + self.minSuffix + ".js",
 								"js/base/scroll-parent" + self.minSuffix + ".js",
-								"js/base/mouse" + self.minSuffix + ".js",
 								"js/base/widget" + self.minSuffix + ".js",
+								"js/base/mouse" + self.minSuffix + ".js",
 								"js/base/draggable" + self.minSuffix + ".js",
 								"js/base/droppable" + self.minSuffix + ".js"
 							]);
@@ -379,11 +379,11 @@
 					if (o.resizable) {
 						if (!self.loadAtOnce) {
 							self.require( [
+								"js/base/widget" + self.minSuffix + ".js",
 								"js/base/mouse" + self.minSuffix + ".js",
 								"js/base/disable-selection" + self.minSuffix + ".js",
 								"js/base/plugin" + self.minSuffix + ".js",
 								"js/base/version" + self.minSuffix + ".js",
-								"js/base/widget" + self.minSuffix + ".js",
 								"js/base/resizable" + self.minSuffix + ".js"
 							]);
 						}
@@ -552,10 +552,12 @@
 					});
             if (!self.loadAtOnce) {
                 self.require([
+					"js/base/widget" + self.minSuffix + ".js",
 					"js/base/mouse" + self.minSuffix + ".js",
 					"js/base/position" + self.minSuffix + ".js",
 					"js/base/data" + self.minSuffix + ".js",
 					"js/base/disable-selection" + self.minSuffix + ".js",
+					"js/base/plugin" + self.minSuffix + ".js",
 					"js/base/resizable" + self.minSuffix + ".js",
 					"js/base/focusable" + self.minSuffix + ".js",
 					"js/base/keycode" + self.minSuffix + ".js",
@@ -565,9 +567,7 @@
 					"js/base/tabbable" + self.minSuffix + ".js",
 					"js/base/unique-id" + self.minSuffix + ".js",
 					"js/base/version" + self.minSuffix + ".js",
-					"js/base/plugin" + self.minSuffix + ".js",
 					"js/base/draggable" + self.minSuffix + ".js",
-					"js/base/widget" + self.minSuffix + ".js",
 					"js/base/button" + self.minSuffix + ".js",
 					"js/base/dialog" + self.minSuffix + ".js"
 				]);
@@ -577,12 +577,12 @@
 			if(o.sortable || o.sortableRows) {
 				if (!self.loadAtOnce) {
 					self.require( [
+						"js/base/widget" + self.minSuffix + ".js",
 						"js/base/mouse" + self.minSuffix + ".js",
 						"js/base/data" + self.minSuffix + ".js",
 						"js/base/ie" + self.minSuffix + ".js",
 						"js/base/scroll-parent" + self.minSuffix + ".js",
 						"js/base/version" + self.minSuffix + ".js",
-						"js/base/widget" + self.minSuffix + ".js",
 						"js/base/sortable" + self.minSuffix + ".js"
 					]);
 				}

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.min.js
+src/main/resources/template/js/base/jquery.ba-bbq.min.js
+src/main/resources/template/js/base/jquery.combobox.min.js
+src/main/resources/template/js/base/jquery.form.min.js
+src/main/resources/template/js/base/jquery.mousewheel.min.js
+src/main/resources/template/js/base/jquery.subscribe.min.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/struts2-jquery-plugin/src/main/resources/template/jquery/dialog-close.ftl b/struts2-jquery-plugin/src/main/resources/template/jquery/dialog-close.ftl
@@ -95,7 +95,6 @@ jQuery(document).ready(function () {
 	<#if parameters.overlayOpacity?if_exists != "">
 	options_${escapedOptionId?html}.opacity = ${parameters.overlayOpacity?html};
 	<#else>
-	opacity="0.7"<#rt/>
 	options_${escapedOptionId?html}.opacity = 0.7;
 	</#if>
   </#if>

diff --git a/struts2-jquery-plugin/src/main/resources/template/jquery/head.ftl b/struts2-jquery-plugin/src/main/resources/template/jquery/head.ftl
@@ -23,6 +23,8 @@
     <#assign jQueryVersion="2.2.4">
 </#if>
 <#assign jQueryUIVersion="1.12.1">
+<#-- issue89: temporary fix because of i18n files not being available for current jQuery UI version -->
+<#assign jQueryUIVersionI18n="1.11.1">
 <#assign struts2jQueryVersion="${version}">
 
 <#if parameters.scriptPath?if_exists != "">
@@ -50,6 +52,7 @@
     <#assign jqueryUiStrutsFile="jquery.ui.struts2.min.js?s2j=${struts2jQueryVersion}">
     <#assign jqueryGoogle="${googlePath}/jquery.min.js">
     <#assign jqueryUiGoogle="${googleUiPath}/jquery-ui.min.js">
+    <#assign jqueryUiVersionFile="version.min.js">
 <#else>
     <#assign jqueryFile="jquery-${jQueryVersion}.js">
     <#assign jqueryForm="jquery.form.js?s2j=${struts2jQueryVersion}">
@@ -61,6 +64,7 @@
     <#assign jqueryUiStrutsFile="jquery.ui.struts2.js?s2j=${struts2jQueryVersion}">
     <#assign jqueryGoogle="${googlePath}/jquery.js">
     <#assign jqueryUiGoogle="${googleUiPath}/jquery-ui.js">
+    <#assign jqueryUiVersionFile="version.js">
 </#if>
 
 <#if parameters.loadFromGoogle?default(false)>
@@ -71,7 +75,7 @@
     <script type="text/javascript" src="${jqueryUiGoogle}"></script>
         <#if parameters.jqueryLocale?if_exists != "" && parameters.jqueryLocale?if_exists != "en">
         <script type="text/javascript"
-                src="//ajax.googleapis.com/ajax/libs/jqueryui/${jQueryUIVersion}/i18n/datepicker-${parameters.jqueryLocale?string}.min.js"></script>
+                src="//ajax.googleapis.com/ajax/libs/jqueryui/${jQueryUIVersionI18n}/i18n/datepicker-${parameters.jqueryLocale?string}.min.js"></script>
         </#if>
     </#if>
 <#else>
@@ -87,6 +91,7 @@
             </#if>
         <#else>
         <!-- script type="text/javascript" src="${javaScriptBasePath}js/base/${jqueryUICoreFile}"></script -->
+        <script type="text/javascript" src="${javaScriptBasePath}js/base/${jqueryUiVersionFile}"></script>
         </#if>
     </#if>
 </#if>

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