You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/12/17 15:22:51 UTC
svn commit: r1422942 - in /myfaces/tomahawk/trunk:
core/src/main/java/org/apache/myfaces/custom/swapimage/
core/src/main/resources/org/apache/myfaces/custom/swapimage/resource/
core20/src/main/java/org/apache/myfaces/custom/swapimage/
core20/src/main/j...
Author: werpu
Date: Mon Dec 17 14:22:50 2012
New Revision: 1422942
URL: http://svn.apache.org/viewvc?rev=1422942&view=rev
Log:
TOMAHAWK-1652
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java
myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/swapimage/resource/swapimage.js
myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java
myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.swapimage/swapimage.js
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java?rev=1422942&r1=1422941&r2=1422942&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java Mon Dec 17 14:22:50 2012
@@ -97,8 +97,8 @@ public class HtmlSwapImageRenderer
if (swapImageUrl != null)
{
- writer.writeAttribute(HTML.ONMOUSEOVER_ATTR, "SI_MM_swapImage('" + getClientId(facesContext, uiComponent) + "','','" + facesContext.getExternalContext().encodeResourceURL(swapImageUrl) + "',1);", null);
- writer.writeAttribute(HTML.ONMOUSEOUT_ATTR, "SI_MM_swapImgRestore();", null);
+ writer.writeAttribute(HTML.ONMOUSEOVER_ATTR, "org.apache.myfaces.SwapImage.swapImage('" + getClientId(facesContext, uiComponent) + "','','" + facesContext.getExternalContext().encodeResourceURL(swapImageUrl) + "',1);", null);
+ writer.writeAttribute(HTML.ONMOUSEOUT_ATTR, "org.apache.myfaces.SwapImage.restore();", null);
}
}
Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/swapimage/resource/swapimage.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/swapimage/resource/swapimage.js?rev=1422942&r1=1422941&r2=1422942&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/swapimage/resource/swapimage.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/swapimage/resource/swapimage.js Mon Dec 17 14:22:50 2012
@@ -1,16 +1,39 @@
-function SI_MM_swapImgRestore() { //v3.0
- var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
-}
+window.org = window.org || {};
+org.apache = org.apache || {};
+org.apache.myfaces = org.apache.myfaces || {};
-function SI_MM_swapImage() { //v3.0
- var i,j=0,x,a=SI_MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
- if ((x=SI_MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
-}
+if (!org.apache.myfaces.SwapImage) {
+ org.apache.myfaces.SwapImage = function () {
+ };
-function SI_MM_findObj(n, d) { //v4.01
- var p,i,x; if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
- d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
- if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
- for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=SI_MM_findObj(n,d.layers[i].document);
- if(!x && d.getElementById) x=d.getElementById(n); return x;
-}
+ org.apache.myfaces.SwapImage.restore = function () { //v3.0
+ var i, x, a = org.apache.myfaces.SwapImage.MM_sr;
+ for (i = 0; a && i < a.length && (x = a[i]) && x.oSrc; i++) x.src = x.oSrc;
+ };
+
+ org.apache.myfaces.SwapImage.swapImage = function () { //v3.0
+ var i, j = 0, x, a = arguments;
+ org.apache.myfaces.SwapImage.MM_sr = new Array;
+ for (i = 0; i < (a.length - 2); i += 3) {
+ if ((x = org.apache.myfaces.SwapImage.findObj(a[i])) != null) {
+ org.apache.myfaces.SwapImage.MM_sr[j++] = x;
+ if (!x.oSrc) x.oSrc = x.src;
+ x.src = a[i + 2];
+ }
+ }
+ };
+
+ org.apache.myfaces.SwapImage.findObj = function (n, d) { //v4.01
+ var p, i, x;
+ if (!d) d = document;
+ if ((p = n.indexOf("?")) > 0 && parent.frames.length) {
+ d = parent.frames[n.substring(p + 1)].document;
+ n = n.substring(0, p);
+ }
+ if (!(x = d[n]) && d.all) x = d.all[n];
+ for (i = 0; !x && i < d.forms.length; i++) x = d.forms[i][n];
+ for (i = 0; !x && d.layers && i < d.layers.length; i++) x = org.apache.myfaces.SwapImage.findObj(n, d.layers[i].document);
+ if (!x && d.getElementById) x = d.getElementById(n);
+ return x;
+ };
+}
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java?rev=1422942&r1=1422941&r2=1422942&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java Mon Dec 17 14:22:50 2012
@@ -115,10 +115,10 @@ public class HtmlSwapImageRenderer
{
HtmlRendererUtils.renderBehaviorizedAttribute(facesContext, writer, HTML.ONMOUSEOVER_ATTR, uiComponent,
ClientBehaviorEvents.MOUSEOVER, null, behaviors, HTML.ONMOUSEOVER_ATTR, swapImage.getOnmouseover(),
- "SI_MM_swapImage('" + getClientId(facesContext, uiComponent) + "','','" + facesContext.getExternalContext().encodeResourceURL(swapImageUrl) + "',1);");
+ "org.apache.myfaces.SwapImage.swapImage('" + getClientId(facesContext, uiComponent) + "','','" + facesContext.getExternalContext().encodeResourceURL(swapImageUrl) + "',1);");
HtmlRendererUtils.renderBehaviorizedAttribute(facesContext, writer, HTML.ONMOUSEOUT_ATTR, uiComponent,
ClientBehaviorEvents.MOUSEOUT, null, behaviors, HTML.ONMOUSEOUT_ATTR, swapImage.getOnmouseout(),
- "SI_MM_swapImgRestore();");
+ "org.apache.myfaces.SwapImage.restore();");
}
else
{
@@ -137,8 +137,8 @@ public class HtmlSwapImageRenderer
{
if (swapImageUrl != null)
{
- writer.writeAttribute(HTML.ONMOUSEOVER_ATTR, "SI_MM_swapImage('" + getClientId(facesContext, uiComponent) + "','','" + facesContext.getExternalContext().encodeResourceURL(swapImageUrl) + "',1);", null);
- writer.writeAttribute(HTML.ONMOUSEOUT_ATTR, "SI_MM_swapImgRestore();", null);
+ writer.writeAttribute(HTML.ONMOUSEOVER_ATTR, "org.apache.myfaces.SwapImage.swapImage('" + getClientId(facesContext, uiComponent) + "','','" + facesContext.getExternalContext().encodeResourceURL(swapImageUrl) + "',1);", null);
+ writer.writeAttribute(HTML.ONMOUSEOUT_ATTR, "org.apache.myfaces.SwapImage.restore();", null);
}
else
{
Modified: myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.swapimage/swapimage.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.swapimage/swapimage.js?rev=1422942&r1=1422941&r2=1422942&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.swapimage/swapimage.js (original)
+++ myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.swapimage/swapimage.js Mon Dec 17 14:22:50 2012
@@ -1,16 +1,39 @@
-function SI_MM_swapImgRestore() { //v3.0
- var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
-}
+window.org = window.org || {};
+org.apache = org.apache || {};
+org.apache.myfaces = org.apache.myfaces || {};
-function SI_MM_swapImage() { //v3.0
- var i,j=0,x,a=SI_MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
- if ((x=SI_MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
-}
+if (!org.apache.myfaces.SwapImage) {
+ org.apache.myfaces.SwapImage = function () {
+ };
-function SI_MM_findObj(n, d) { //v4.01
- var p,i,x; if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
- d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
- if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
- for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=SI_MM_findObj(n,d.layers[i].document);
- if(!x && d.getElementById) x=d.getElementById(n); return x;
-}
+ org.apache.myfaces.SwapImage.restore = function () { //v3.0
+ var i, x, a = org.apache.myfaces.SwapImage.MM_sr;
+ for (i = 0; a && i < a.length && (x = a[i]) && x.oSrc; i++) x.src = x.oSrc;
+ };
+
+ org.apache.myfaces.SwapImage.swapImage = function () { //v3.0
+ var i, j = 0, x, a = arguments;
+ org.apache.myfaces.SwapImage.MM_sr = new Array;
+ for (i = 0; i < (a.length - 2); i += 3) {
+ if ((x = org.apache.myfaces.SwapImage.findObj(a[i])) != null) {
+ org.apache.myfaces.SwapImage.MM_sr[j++] = x;
+ if (!x.oSrc) x.oSrc = x.src;
+ x.src = a[i + 2];
+ }
+ }
+ };
+
+ org.apache.myfaces.SwapImage.findObj = function (n, d) { //v4.01
+ var p, i, x;
+ if (!d) d = document;
+ if ((p = n.indexOf("?")) > 0 && parent.frames.length) {
+ d = parent.frames[n.substring(p + 1)].document;
+ n = n.substring(0, p);
+ }
+ if (!(x = d[n]) && d.all) x = d.all[n];
+ for (i = 0; !x && i < d.forms.length; i++) x = d.forms[i][n];
+ for (i = 0; !x && d.layers && i < d.layers.length; i++) x = org.apache.myfaces.SwapImage.findObj(n, d.layers[i].document);
+ if (!x && d.getElementById) x = d.getElementById(n);
+ return x;
+ };
+}
\ No newline at end of file