[js-embedded-discovery COMMIT] in /trunk: build/build.bat build/build.sh src/javascript/idpselect.js src/javascript/i...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jan 20 06:34:49 2015
New Revision: 133

URL: http://svn.shibboleth.net/view/js-embedded-discovery?rev=133&view=rev
Log:
EDS-60 Move languages from the configuration to the minimised code, while allowing for override in the config

Added:
    trunk/src/javascript/idpselect_languages.js
Modified:
    trunk/build/build.bat
    trunk/build/build.sh
    trunk/src/javascript/idpselect.js
    trunk/src/javascript/idpselect_config.js

Modified: trunk/build/build.bat
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/build/build.bat?rev=133&r1=132&r2=133&view=diff
==============================================================================
--- trunk/build/build.bat (original)
+++ trunk/build/build.bat Tue Jan 20 06:34:49 2015
@@ -24,7 +24,7 @@
 
 rem Build js
 
-copy /b /y ..\src\javascript\typeahead.js+..\src\javascript\idpselect.js %TEMP%\idpselect.js
+copy /b /y ..\src\javascript\idpselect_languages.js+..\src\javascript\typeahead.js+..\src\javascript\idpselect.js %TEMP%\idpselect.js
 java -jar yuicompressor-2.4.8.jar -o ..\target\idpselect.js %TEMP%\idpselect.js
 del/q %TEMP%\idpselect.js
 
@@ -43,6 +43,7 @@
 copy ..\src\javascript\json2.js ..\target\nonminimised\
 copy ..\src\javascript\typeahead.js ..\target\nonminimised\
 copy ..\src\javascript\idpselect.js ..\target\nonminimised\
+copy ..\src\javascript\idpselect_languages.js ..\target\nonminimised\
 
 rem Zip it up
 

Modified: trunk/build/build.sh
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/build/build.sh?rev=133&r1=132&r2=133&view=diff
==============================================================================
--- trunk/build/build.sh (original)
+++ trunk/build/build.sh Tue Jan 20 06:34:49 2015
@@ -39,7 +39,7 @@
 
 # Build js
 
-cat ../src/javascript/typeahead.js ../src/javascript/idpselect.js | java -jar 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 yuicompressor-2.4.8.jar -o ../target/idpselect.js --type js
 
 # Build CSS
 java -jar yuicompressor-2.4.8.jar -o ../target/idpselect.js --type css ../src/resources/idpselect.css
@@ -56,6 +56,7 @@
 cp ../src/javascript/json2.js ../target/nonminimised
 cp ../src/javascript/typeahead.js ../target/nonminimised
 cp ../src/javascript/idpselect.js ../target/nonminimised
+cp ../src/javascript/idpselect_languages.js ../target/nonminimised
 # rem Zip it up
 
 cd ../target

Modified: trunk/src/javascript/idpselect.js
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/src/javascript/idpselect.js?rev=133&r1=132&r2=133&view=diff
==============================================================================
--- trunk/src/javascript/idpselect.js (original)
+++ trunk/src/javascript/idpselect.js Tue Jan 20 06:34:49 2015
@@ -152,23 +152,40 @@
         maxIdPCharsDropDown = paramsSupplied.maxIdPCharsDropDown;
         maxIdPCharsAltTxt = paramsSupplied.maxIdPCharsAltTxt;
 
+        var lang;
+
         if (typeof navigator == 'undefined') {
             lang = paramsSupplied.defaultLanguage;
         } else {
             lang = navigator.language || navigator.userLanguage || paramsSupplied.defaultLanguage;
         }
+        lang = lang.toLowerCase();
+
         if (lang.indexOf('-') > 0) {
             majorLang = lang.substring(0, lang.indexOf('-'));
         }
 
+        var providedLangs = new IdPSelectLanguages();
+
         defaultLang = paramsSupplied.defaultLanguage;
 
-        if (typeof paramsSupplied.langBundles[lang] != 'undefined') {
+        if (typeof paramsSupplied.langBundles != 'undefined' && typeof paramsSupplied.langBundles[lang] != 'undefined') {
             langBundle = paramsSupplied.langBundles[lang];
-        } else if (typeof majorLang != 'undefined' && typeof paramsSupplied.langBundles[majorLang] != 'undefined') {
-            langBundle = paramsSupplied.langBundles[majorLang];
-        }
-        defaultLangBundle = paramsSupplied.langBundles[paramsSupplied.defaultLanguage];
+        } else if (typeof providedLangs.langBundles[lang] != 'undefined') {
+            langBundle = providedLangs.langBundles[lang];
+        } else if (typeof majorLang != 'undefined') {
+            if (typeof paramsSupplied.langBundles != 'undefined' && typeof paramsSupplied.langBundles[majorLang] != 'undefined') {
+                langBundle = paramsSupplied.langBundles[majorLang];
+            } else if (typeof providedLangs.langBundles[majorLang] != 'undefined') {
+                langBundle = providedLangs.langBundles[majorLang];
+            }
+        }
+        
+        if (typeof paramsSupplied.langBundles != 'undefined' && typeof paramsSupplied.langBundles[paramsSupplied.defaultLanguage] != 'undefined') {
+            defaultLangBundle = paramsSupplied.langBundles[paramsSupplied.defaultLanguage];
+        } else {
+            defaultLangBundle = providedLangs.langBundles[paramsSupplied.defaultLanguage];
+        }
 
         //
         // Setup Language bundles
@@ -1385,4 +1402,5 @@
         // Nothing
     };
 }
+

[... 135 lines stripped ...]