[js-embedded-discovery COMMIT] /trunk/src/javascript/idpselect.js

[noreply at shibboleth.net]

Author: rdw
Date: Fri May 15 06:21:18 2015
New Revision: 153

URL: http://svn.shibboleth.net/view/js-embedded-discovery?rev=153&view=rev
Log:
https://issues.shibboleth.net/jira/browse/EDS-65 Do not collapse the EDS height when there are no provided logos unless we are told to

Modified:
    trunk/src/javascript/idpselect.js

Modified: trunk/src/javascript/idpselect.js
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/src/javascript/idpselect.js?rev=153&r1=152&r2=153&view=diff
==============================================================================
--- trunk/src/javascript/idpselect.js	(original)
+++ trunk/src/javascript/idpselect.js	Fri May 15 06:21:18 2015
@@ -18,6 +18,7 @@
     var maxWidth;
     var maxHeight;
     var bestRatio;
+    var doNotCollapse;
 
     //
     // Parameters passed into our closure
@@ -148,6 +149,12 @@
         maxWidth = paramsSupplied.maxWidth;
         maxHeight = paramsSupplied.maxHeight;
         bestRatio = paramsSupplied.bestRatio;
+        if (paramsSupplied.doNotCollapse) { 
+            doNotCollapse = paramsSupplied.doNotCollapse;
+        } else {
+            doNotCollapse = false;
+        }
+            
         maxIdPCharsButton = paramsSupplied.maxIdPCharsButton;
         maxIdPCharsDropDown = paramsSupplied.maxIdPCharsDropDown;
         maxIdPCharsAltTxt = paramsSupplied.maxIdPCharsAltTxt;
@@ -704,7 +711,7 @@
             return false;
         }
 
-        var atLeastOneImg = false;
+        var atLeastOneImg = doNotCollapse;
         for(var i = 0 ; i < maxPreferredIdPs && i < preferredIdPs.length; i++){
             if (preferredIdPs[i] && getImageForIdP(preferredIdPs[i], false)) {
                 atLeastOneImg = true;