svn commit: r416445 - in /myfaces/tomahawk/trunk/core/src/main: java/org/apache/myfaces/component/html/util/ java/org/apache/myfaces/custom/calendar/ resources/org/apache/myfaces/custom/calendar/resource/

[im...@apache.org]

Author: imario
Date: Thu Jun 22 12:05:12 2006
New Revision: 416445

URL: http://svn.apache.org/viewvc?rev=416445&view=rev
Log:
fixed calendar do not popup when using forceId
fixed IE mixed content (http/https) warning

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
    myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/calendar/resource/popcalendar.js

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java?rev=416445&r1=416444&r2=416445&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java Thu Jun 22 12:05:12 2006
@@ -103,7 +103,7 @@
         }
     }
 
-    private static boolean getBooleanValue(String attribute, Object value, boolean defaultValue)
+    public static boolean getBooleanValue(String attribute, Object value, boolean defaultValue)
     {
         if(value instanceof Boolean)
         {

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=416445&r1=416444&r2=416445&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Thu Jun 22 12:05:12 2006
@@ -55,6 +55,7 @@
 import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.shared_tomahawk.renderkit.html.util.JavascriptUtils;
 import org.apache.myfaces.shared_tomahawk.util.MessageUtils;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
 
 /**
  * @author Martin Marinschek (latest modification by $Author$)
@@ -281,6 +282,15 @@
         if(inputText == null)
         {
             inputText = (HtmlInputTextHelp) application.createComponent(HtmlInputTextHelp.COMPONENT_TYPE);
+
+            boolean forceId = HtmlComponentUtils.getBooleanValue(
+                    JSFAttr.FORCE_ID_ATTR,
+                    inputCalendar.getAttributes().get(JSFAttr.FORCE_ID_ATTR),
+                    false);
+            if (forceId)
+            {
+                inputText.getAttributes().put(JSFAttr.FORCE_ID_ATTR, Boolean.TRUE);
+            }
         }
         return inputText;
     }

Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/calendar/resource/popcalendar.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/calendar/resource/popcalendar.js?rev=416445&r1=416444&r2=416445&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/calendar/resource/popcalendar.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/calendar/resource/popcalendar.js Thu Jun 22 12:05:12 2006
@@ -121,7 +121,8 @@
 
         if (iframe == null)
         {
-            iframe = document.createElement("<iframe id='" + overDiv.id + "_IFRAME' style='visibility:hidden; position: absolute; top:0px;left:0px;'/>");
+            // the source attirbute is to avoid a IE error message about non secure content on https connections
+            iframe = document.createElement("<iframe src='javascript:false;' id='" + overDiv.id + "_IFRAME' style='visibility:hidden; position: absolute; top:0px;left:0px;'/>");
             this.containerCtl.appendChild(iframe);
         }