[js-embedded-discovery COMMIT] in /trunk: doc/RELEASE-NOTES.txt src/javascript/idpselect.js src/javascript/idpselect_...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Mar 27 17:41:51 2012
New Revision: 108

URL: http://svn.shibboleth.net/view/js-embedded-discovery?rev=108&view=rev
Log:
https://issues.shibboleth.net/jira/browse/EDS-34 Control whether typeahead or drop down is shown first
https://issues.shibboleth.net/jira/browse/EDS-38 Control whether we set focus to the typeahead box


Modified:
    trunk/doc/RELEASE-NOTES.txt
    trunk/src/javascript/idpselect.js
    trunk/src/javascript/idpselect_config.js
    trunk/src/javascript/typeahead.js

Modified: trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/doc/RELEASE-NOTES.txt?rev=108&r1=107&r2=108&view=diff
==============================================================================
--- trunk/doc/RELEASE-NOTES.txt (original)
+++ trunk/doc/RELEASE-NOTES.txt Tue Mar 27 17:41:51 2012
@@ -1,3 +1,7 @@
+Chnaged in V1.1.0
+EDS-34 Allow configuration of dropdown rather than typeahead.
+EDS-88 Allow configuration to not set focus to search box.
+
 Changed in V1.0.3
 =============================================
 EDS-36 Message located in wrong place in the face of font changes.

Modified: trunk/src/javascript/idpselect.js
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/src/javascript/idpselect.js?rev=108&r1=107&r2=108&view=diff
==============================================================================
--- trunk/src/javascript/idpselect.js (original)
+++ trunk/src/javascript/idpselect.js Tue Mar 27 17:41:51 2012
@@ -32,6 +32,7 @@
     var alwaysShow;
     var maxResults;
     var ignoreKeywords;
+    var showListFirst;
 
     //
     // The cookie contents
@@ -89,7 +90,7 @@
         
         var idpSelector = buildIdPSelector();
         idpSelectDiv.appendChild(idpSelector);
-        dropDownControl.draw();
+        dropDownControl.draw(parms.setFocusTextBox);
     } ;
     
     // *************************************
@@ -119,6 +120,11 @@
         alwaysShow = paramsSupplied.alwaysShow;
         maxResults = paramsSupplied.maxResults;
         ignoreKeywords = paramsSupplied.ignoreKeywords;
+        if (paramsSupplied.showListFirst) {
+            showListFirst = paramsSupplied.showListFirst;
+        } else {
+            showListFirst = false;
+        }
         defaultLogo = paramsSupplied.defaultLogo;
         defaultLogoWidth = paramsSupplied.defaultLogoWidth;
         defaultLogoHeight = paramsSupplied.defaultLogoHeight;
@@ -696,7 +702,11 @@
     */
     var buildIdPEntryTile = function(parentDiv, preferredTile) {
 
+
         idpEntryDiv = buildDiv('IdPEntryTile');
+        if (showListFirst) {
+            idpEntryDiv.style.display = 'none';
+        }
 
         if (preferredTile) {
             buildTextDiv(idpEntryDiv, 'idpEntry.label');
@@ -774,7 +784,9 @@
     */
     var buildIdPDropDownListTile = function(parentDiv, preferredTile) {
         idpListDiv = buildDiv('IdPListTile');
-        idpListDiv.style.display = 'none';
+        if (!showListFirst) {
+            idpListDiv.style.display = 'none';
+        }
 
         if (preferredTile) {
             buildTextDiv(idpListDiv, 'idpList.label');

Modified: trunk/src/javascript/idpselect_config.js
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/src/javascript/idpselect_config.js?rev=108&r1=107&r2=108&view=diff
==============================================================================
--- trunk/src/javascript/idpselect_config.js (original)
+++ trunk/src/javascript/idpselect_config.js Tue Mar 27 17:41:51 2012
@@ -5,7 +5,7 @@
     // Adjust the following to fit into your local configuration
     //
     this.alwaysShow = true;          // If true, this will show results as soon as you start typing
-    this.dataSource = '/Shibboleth.sso/DiscoFeed';    // Where to get the data from
+    this.dataSource = 'DiscoFeed';    // Where to get the data from
     this.defaultLanguage = 'en';     // Language to use if the browser local doesnt have a bundle
     this.defaultLogo = 'flyingpiglogo.jpg';
     this.defaultLogoWidth = 90;
@@ -24,7 +24,9 @@
     this.preferredIdP = null;        // Array of entityIds to always show
     this.hiddenIdPs = null;          // Array of entityIds to delete
     this.ignoreKeywords = false;     // Do we ignore the <mdui:Keywords/> when looking for candidates
+    this.showListFirst = false;      // Do we start with a list of IdPs or just one
     this.samlIdPCookieTTL = 730;     // in days
+    this.setFocusTextBox = true;     // Set to false to supress focus 
     this.testGUI = false;
 
 

Modified: trunk/src/javascript/typeahead.js
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/src/javascript/typeahead.js?rev=108&r1=107&r2=108&view=diff
==============================================================================
--- trunk/src/javascript/typeahead.js (original)
+++ trunk/src/javascript/typeahead.js Tue Mar 27 17:41:51 2012
@@ -18,7 +18,7 @@
     this.getKeywords = getKeywords;
 }
 
-TypeAheadControl.prototype.draw = function() {
+TypeAheadControl.prototype.draw = function(setFocus) {
 
     //

[... 13 lines stripped ...]