[js-embedded-discovery COMMIT] in /trunk: Makefile src/javascript/idpselect.js src/javascript/idpselect_config.js src...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Apr 29 11:44:25 2015
New Revision: 143

URL: http://svn.shibboleth.net/view/js-embedded-discovery?rev=143&view=rev
Log:
More minor ARIA chnages

Modified:
    trunk/Makefile
    trunk/src/javascript/idpselect.js
    trunk/src/javascript/idpselect_config.js
    trunk/src/javascript/typeahead.js

Modified: trunk/Makefile
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/Makefile?rev=143&r1=142&r2=143&view=diff
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Apr 29 11:44:25 2015
@@ -17,9 +17,9 @@
 kit:	clean
 	mkdir ${TARGET}
 	mkdir ${TARGET}\nonminimised
-	cat ..\src\javascript\idpselect_languages.js src/javascript/typeahead.js src/javascript/idpselect.js | ${JAVA} -jar build/yuicompressor-2.4.8.jar -o ${TARGET}/idpselect.js --type js
+	cat src\javascript\idpselect_languages.js src/javascript/typeahead.js src/javascript/idpselect.js | ${JAVA} -jar build/yuicompressor-2.4.8.jar -o ${TARGET}/idpselect.js --type js
 	cp Makefile shibboleth-embedded-ds.spec LICENSE.txt doc/*.txt src/resources/index.html src/resources/idpselect.css src/javascript/idpselect_config.js src/apache/*.conf ${TARGET}
-	cp src/javascript/*.js ${TARGET}\nonminimised
+	cp src\javascript\*.js ${TARGET}\nonminimised
 
 dist:	kit
 	${TAR} czf ${TARGET}.tar.gz ${TARGET}/*; rm -rf ${TARGET}

Modified: trunk/src/javascript/idpselect.js
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/src/javascript/idpselect.js?rev=143&r1=142&r2=143&view=diff
==============================================================================
--- trunk/src/javascript/idpselect.js	(original)
+++ trunk/src/javascript/idpselect.js	Wed Apr 29 11:44:25 2015
@@ -221,7 +221,7 @@
         var parmlist = loc.search;
         if (ignoreURLParams || null == parmlist || 0 == parmlist.length || parmlist.charAt(0) != '?') {
 
-            if (null == paramsSupplied.defaultReturn) {
+            if ((null == paramsSupplied.defaultReturn)&& !ignoreURLParams) {
 
                 fatal(getLocalizedMessage('fatal.noparms'));
                 return false;

Modified: trunk/src/javascript/idpselect_config.js
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/src/javascript/idpselect_config.js?rev=143&r1=142&r2=143&view=diff
==============================================================================
--- trunk/src/javascript/idpselect_config.js	(original)
+++ trunk/src/javascript/idpselect_config.js	Wed Apr 29 11:44:25 2015
@@ -5,14 +5,14 @@
     // 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 = 'blank.gif';  // Replace with your own logo
     this.defaultLogoWidth = 1;
     this.defaultLogoHeight = 1 ;
     this.defaultReturn = null;       // If non null, then the default place to send users who are not
                                      // Approaching via the Discovery Protocol for example
-    //this.defaultReturn = "https://example.org/Shibboleth.sso/DS?SAMLDS=1&target=https://example.org/secure";
+    this.defaultReturn = "https://example.org/Shibboleth.sso/DS?SAMLDS=1&target=https://example.org/secure";
     this.defaultReturnIDParam = null;
     this.helpURL = 'https://wiki.shibboleth.net/confluence/display/SHIB2/DSRoadmap';
     this.ie6Hack = null;             // An array of structures to disable when drawing the pull down (needed to 

Modified: trunk/src/javascript/typeahead.js
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/src/javascript/typeahead.js?rev=143&r1=142&r2=143&view=diff
==============================================================================
--- trunk/src/javascript/typeahead.js	(original)
+++ trunk/src/javascript/typeahead.js	Wed Apr 29 11:44:25 2015
@@ -30,7 +30,7 @@
     //
     // Set up the 'dropDown'
     //
-    this.dropDown = document.createElement('div');
+    this.dropDown = document.createElement('ul');
     this.dropDown.className = 'IdPSelectDropDown';
     this.dropDown.style.visibility = 'hidden';
 
@@ -44,6 +44,7 @@
     //
     this.textBox.setAttribute('role', 'combobox');
     this.textBox.setAttribute('aria-controls', 'IdPSelectDropDown');
+    this.textBox.setAttribute('aria-owns', 'IdPSelectDropDown');
 
     //
     // mouse listeners for the dropdown box
@@ -199,7 +200,7 @@
         }
     }
     this.dropDown.style.visibility = 'hidden';
-    this.dropDown.setAttribute('aria-expanded', 'false');
+    this.textBox.setAttribute('aria-expanded', 'false');
 
 
     if (-1 == this.dropDown.current) {
@@ -216,7 +217,7 @@
         }
     }
     this.dropDown.style.visibility = 'visible';
-    this.dropDown.setAttribute('aria-expanded', 'true');
+    this.textBox.setAttribute('aria-expanded', 'true');
 };

[... 84 lines stripped ...]