You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2014/06/18 21:12:10 UTC

svn commit: r1603588 - /myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PopupDialog.js

Author: gcrawford
Date: Wed Jun 18 19:12:10 2014
New Revision: 1603588

URL: http://svn.apache.org/r1603588
Log:
TRINIDAD-2482
Trinidad date picker dialog doesn't open on ie 10 and ie 11

thanks to paresh for the patch

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PopupDialog.js

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PopupDialog.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PopupDialog.js?rev=1603588&r1=1603587&r2=1603588&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PopupDialog.js (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PopupDialog.js Wed Jun 18 19:12:10 2014
@@ -201,7 +201,9 @@ TrPopupDialog._initDialogPage = function
   // Resize the dialog to the page content
   if (!dialog._fixedSize)
   {
-    if (_agent.isIE)
+    // The Document property is not available on the iframe object
+	// in ie10 but, the contentDocument property is available since IE8.
+    if (_agent.isIE && _agent.version < 8)
     {
       dialog._resizeIFrame(
         dialog._iframe.Document.body.scrollWidth+40, 
@@ -218,7 +220,7 @@ TrPopupDialog._initDialogPage = function
   {
     if(dialog._variableWidth)
     {
-      if (_agent.isIE)
+      if (_agent.isIE && _agent.version < 8)
       {
         dialog._resizeIFrame(dialog._iframe.Document.body.scrollWidth+40, null);
       }
@@ -230,7 +232,7 @@ TrPopupDialog._initDialogPage = function
 
     if(dialog._variableHeight)
     {
-      if (_agent.isIE)
+      if (_agent.isIE && _agent.version < 8)
       {
         dialog._resizeIFrame(null, dialog._iframe.Document.body.scrollHeight+40);
       }