You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/11/21 10:04:53 UTC
svn commit: r1204406 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/ajax/res/js/
wicket-core/src/main/java/org/apache/wicket/markup/html/internal/
wicket-core/src/test/java/org/apache/wicket/ajax/
wicket-datetime/src/test/java/org/apac...
Author: mgrigorov
Date: Mon Nov 21 09:04:51 2011
New Revision: 1204406
URL: http://svn.apache.org/viewvc?rev=1204406&view=rev
Log:
WICKET-4236 Use JQuery as a backing library for Wicket's JavaScript code
Fix ModalWindow and Dates examples
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js?rev=1204406&r1=1204405&r2=1204406&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js Mon Nov 21 09:04:51 2011
@@ -35,7 +35,7 @@
window.Wicket = {};
- $.extend(true, Wicket, {
+ jQuery.extend(true, Wicket, {
Browser: {
isKHTML: function () {
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=1204406&r1=1204405&r2=1204406&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java Mon Nov 21 09:04:51 2011
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Set;
import org.apache.wicket.Application;
+import org.apache.wicket.ajax.AjaxLibrariesContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Response;
@@ -368,9 +369,7 @@ public abstract class HeaderResponse imp
List<String> token = Arrays.asList("javascript-event", target, event, javascript);
if (wasRendered(token) == false)
{
- renderJavaScriptReference(Application.get()
- .getAjaxSettings()
- .getWicketEventReference());
+ AjaxLibrariesContributor.contribute(Application.get(), this);
JavaScriptUtils.writeJavaScript(getResponse(), "Wicket.Event.add(" + target +
", \"" + event + "\", function(event) { " + javascript + ";});");
markRendered(token);
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html?rev=1204406&r1=1204405&r2=1204406&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html Mon Nov 21 09:04:51 2011
@@ -2,7 +2,15 @@
<head>
<link href="../../test"/>
<script type="text/javascript" src="../../javascripturl"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
+<script type="text/javascript" id="wicket-ajax-debug-enable">
+/*<![CDATA[*/
+Wicket.Ajax.DebugWindow.enabled=true;
+/*]]>*/
+</script>
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) { domReady();;});
@@ -26,14 +34,6 @@ Wicket.Event.add(window, "domready", fun
Wicket.Event.add(window, "load", function(event) { onLoadB();;});
/*]]>*/
</script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
-/*<![CDATA[*/
-Wicket.Ajax.DebugWindow.enabled=true;
-/*]]>*/
-</script>
<script type="text/javascript" id="wicket-ajax-base-url">
/*<![CDATA[*/
Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContributionPage2?0";
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html?rev=1204406&r1=1204405&r2=1204406&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html Mon Nov 21 09:04:51 2011
@@ -2,23 +2,23 @@
<head>
<link href="../../test"/>
<script type="text/javascript" src="../../javascripturl"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" >
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
+<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
-Wicket.Event.add(window, "domready", function(event) { domReady();;});
+Wicket.Ajax.DebugWindow.enabled=true;
/*]]>*/
</script>
<script type="text/javascript" >
/*<![CDATA[*/
-Wicket.Event.add(window, "load", function(event) { onLoad();;});
+Wicket.Event.add(window, "domready", function(event) { domReady();;});
/*]]>*/
</script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" >
/*<![CDATA[*/
-Wicket.Ajax.DebugWindow.enabled=true;
+Wicket.Event.add(window, "load", function(event) { onLoad();;});
/*]]>*/
</script>
<script type="text/javascript" id="wicket-ajax-base-url">
Modified: wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html?rev=1204406&r1=1204405&r2=1204406&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html (original)
+++ wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html Mon Nov 21 09:04:51 2011
@@ -13,7 +13,15 @@ th {
/*]]>*/
</style>
<script type="text/javascript" src="../resource/org.apache.wicket.extensions.yui.YuiLib/yuiloader/yuiloader.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
+<script type="text/javascript" id="wicket-ajax-debug-enable">
+/*<![CDATA[*/
+Wicket.Ajax.DebugWindow.enabled=true;
+/*]]>*/
+</script>
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) { /*
@@ -32,46 +40,53 @@ Wicket.Event.add(window, "domready", fun
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-wicketCalendarInits = [];
-wicketCalendarInitFinished = false;
-wicketCalendarI18n = {};
-wicketCalendarAdd = function(initFn) {
- if (wicketCalendarInitFinished) {
+if (typeof(Wicket) === 'undefined') {
+ window.Wicket = {};
+}
+if (typeof(Wicket.DateTimeInit) === 'undefined') {
+ Wicket.DateTimeInit = {};
+}
+
+Wicket.DateTimeInit.CalendarInits = [];
+Wicket.DateTimeInit.CalendarInitFinished = false;
+Wicket.DateTimeInit.CalendarI18n = {};
+Wicket.DateTimeInit.CalendarAdd = function(initFn) {
+ if (Wicket.DateTimeInit.CalendarInitFinished) {
// when a DatePicker is added via ajax, the loader is already finished, so
// we call the init function directly.
initFn();
} else {
// when page is rendered, all calendar components will be initialized after
// the required js libraries have been loaded.
- wicketCalendarInits.push(initFn);
+ Wicket.DateTimeInit.CalendarInits.push(initFn);
}
};
-var wicketYuiLoader = new YAHOO.util.YUILoader({
+Wicket.DateTimeInit.YuiLoader = new YAHOO.util.YUILoader({
base: "../resource/org.apache.wicket.extensions.yui.YuiLib/",
filter: "RAW",
allowRollup: false,
require: ["wicket-date"],
onSuccess: function() {
- wicketCalendarInitFinished = true;
- while (wicketCalendarInits.length > 0) {
- wicketCalendarInits.pop()();
+ Wicket.DateTimeInit.CalendarInitFinished = true;
+ while (Wicket.DateTimeInit.CalendarInits.length > 0) {
+ Wicket.DateTimeInit.CalendarInits.pop()();
}
}
});
-wicketYuiLoader.addModule({
+Wicket.DateTimeInit.YuiLoader.addModule({
name: "wicket-date",
type: "js",
requires: ["calendar"],
fullpath: "../resource/org.apache.wicket.extensions.yui.calendar.DatePicker/wicket-date.js"
});
-wicketYuiLoader.insert();
+Wicket.DateTimeInit.YuiLoader.insert();
;});
/*]]>*/
</script>
<script type="text/javascript" >
/*<![CDATA[*/
-Wicket.Event.add(window, "domready", function(event) { wicketCalendarI18n["de"]={MONTHS_SHORT:["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],MONTHS_LONG:["Januar","Februar","M\u00E4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],WEEKDAYS_MEDIUM:["So","Mo","Di","Mi","Do","Fr","Sa"],WEEKDAYS_LONG:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],START_WEEKDAY:1,WEEKDAYS_1CHAR:["S","M","D","M","D","F","S"],WEEKDAYS_SHORT:["So","Mo","Di","Mi","Do","Fr","Sa"]};;});
+Wicket.Event.add(window, "domready", function(event) { Wicket.DateTimeInit.CalendarI18n["de"]={MONTHS_SHORT:["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],MONTHS_LONG:["Januar","Februar","M\u00E4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],WEEKDAYS_MEDIUM:["So","Mo","Di","Mi","Do","Fr","Sa"],WEEKDAYS_LONG:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],START_WEEKDAY:1,WEEKDAYS_1CHAR:["S","M","D","M","D","F","S"],WEEKDAYS_SHORT:["So","Mo","Di","Mi","Do","Fr","Sa"]};;});
/*]]>*/
</script>
<script type="text/javascript" >
@@ -92,9 +107,9 @@ Wicket.Event.add(window, "domready", fun
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-wicketCalendarAdd(function() {
+Wicket.DateTimeInit.CalendarAdd(function() {
Wicket.DateTime.init2("dateTextField1", "dateTextField1", {close:true,selected:"xx.xx.xxxx",pagedate:"xx.xxxx"}, "dd.MM.yy",
- true, true, true, false, wicketCalendarI18n["de"], false);
+ true, true, true, false, Wicket.DateTimeInit.CalendarI18n["de"], false);
});
;});
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java?rev=1204406&r1=1204405&r2=1204406&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java Mon Nov 21 09:04:51 2011
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Set;
import org.apache.wicket.Application;
+import org.apache.wicket.ajax.AjaxLibrariesContributor;
import org.apache.wicket.examples.resourcedecoration.GroupedAndOrderedResourceReference.ResourceGroup;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -151,9 +152,7 @@ public class GroupingHeaderResponse
@Override
public void renderOnDomReadyJavaScript(final String javascript)
{
- super.renderJavaScriptReference(Application.get()
- .getAjaxSettings()
- .getWicketEventReference());
+ AjaxLibrariesContributor.contribute(Application.get(), this);
toJsResponse(new Runnable()
{
public void run()
@@ -167,9 +166,7 @@ public class GroupingHeaderResponse
public void renderOnEventJavaScript(final String target, final String event,
final String javascript)
{
- super.renderJavaScriptReference(Application.get()
- .getAjaxSettings()
- .getWicketEventReference());
+ AjaxLibrariesContributor.contribute(Application.get(), this);
toJsResponse(new Runnable()
{
public void run()
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js?rev=1204406&r1=1204405&r2=1204406&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js Mon Nov 21 09:04:51 2011
@@ -1186,7 +1186,7 @@ Wicket.Window.getMarkup = function(idWin
"<div class=\"w_left\" id='"+idLeft+"'>"+
"<div class=\"w_right_1\">"+
"<div class=\"w_right\" id='"+idRight+"'>"+
- "<div class=\"w_content_1\" onmousedown=\"if (Wicket.Browser.isSafari()) { event.ignore = true; } else { Wicket.stopEvent(event); } \">"+
+ "<div class=\"w_content_1\" onmousedown=\"if (Wicket.Browser.isSafari()) { event.ignore = true; } else { Wicket.Event.stop(event); } \">"+
"<div class=\"w_caption\" id=\""+idCaption+"\">"+
"<a class=\"w_close\" style=\"z-index:1\" href=\"#\"></a>"+
"<h3 id=\""+idCaptionText+"\" class=\"w_captionText\"></h3>"+