Author: ivaynberg
Date: Fri Aug 27 04:48:06 2010
New Revision: 990016
URL: http://svn.apache.org/viewvc?rev=990016&view=rev
Log:
Issue: WICKET-2401
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=990016&r1=990015&r2=990016&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
Fri Aug 27 04:48:06 2010
@@ -159,7 +159,8 @@ public abstract class AbstractDefaultAja
* @param partialCall
* Javascript of a partial call to the function performing
the actual ajax callback.
* Must be in format <code>function(params,</code> with
signature
- * <code>function(params, onSuccessHandler,
onFailureHandler</code>. Example: <code>wicketAjaxGet('callbackurl'</code>
+ * <code>function(params, onSuccessHandler,
onFailureHandler</code>. Example:
+ * <code>wicketAjaxGet('callbackurl'</code>
*
* @return script that performs ajax callback to this behavior
*/
@@ -183,7 +184,7 @@ public abstract class AbstractDefaultAja
if (!Strings.isEmpty(indicatorId))
{
- String hide = ";wicketHide('" + indicatorId + "');";
+ String hide = ";Wicket.hideIncrementally('" +
indicatorId + "');";
success = success + hide;
failure = failure + hide;
}
@@ -227,7 +228,7 @@ public abstract class AbstractDefaultAja
if (!Strings.isEmpty(indicatorId))
{
- call = new
AppendingStringBuffer("wicketShow('").append(indicatorId)
+ call = new
AppendingStringBuffer("Wicket.showIncrementally('").append(indicatorId)
.append("');")
.append(call);
}
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?rev=990016&r1=990015&r2=990016&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Fri Aug 27 04:48:06 2010
@@ -382,6 +382,41 @@ Wicket.replaceAll = function(str, from,
return str.replace(regex,to);
}
+/** shows element */
+Wicket.show=function(e) {
+ var e=Wicket.$(e);
+ if (e!=null) {
+ e.style.display = "";
+ }
+}
+/** hides element */
+Wicket.hide=function(e) {
+ var e=Wicket.$(e);
+ if (e!=null) {
+ e.style.display = "none";
+ }
+}
+/** call-counting implementation of Wicket.show() */
+Wicket.showIncrementally=function(e) {
+ var e=Wicket.$(e);
+ if (e==null) return;
+ var count=e.getAttribute("showIncrementallyCount");
+ count=parseInt((count==null)?0:count);
+ if (count>=0) Wicket.show(e);
+ e.setAttribute("showIncrementallyCount", count+1);
+
+}
+/** call-counting implementation of Wicket.hide() */
+Wicket.hideIncrementally=function(e) {
+ var e=Wicket.$(e);
+ if (e==null) return;
+ var count=e.getAttribute("showIncrementallyCount");
+ count=parseInt((count==null)?0:count-1);
+ if (count<=0) Wicket.hide(e);
+ e.setAttribute("showIncrementallyCount", count);
+}
+
+
/**
* Form serialization
*
