diff --git a/js/script.js b/js/script.js index b266835b75a39..6dbbc1b8620fa 100644 --- a/js/script.js +++ b/js/script.js @@ -150,7 +150,7 @@ ot_hardwareAcceleration.on("keypress keyup", function (event) { // var ot_userOsOption = document.getElementById(ot_opts.ot_os); // if (userOsOption) { // selectedOption(os, userOsOption, "os"); - + // } // if (ot_userOsOption) { // ot_selectedOption(ot_os, ot_userOsOption, "ot_os"); @@ -172,7 +172,7 @@ ot_hardwareAcceleration.on("keypress keyup", function (event) { // determine os based on location hash // function getAnchorSelectedOS() { -// var anchor = location.hash; +// var anchor = location.hash; // var ANCHOR_REGEX = /^#[^ ]+$/; // // Look for anchor in the href // if (!ANCHOR_REGEX.test(anchor)) { @@ -193,9 +193,9 @@ function checkValidity(){ var current_lang = opts['language']; var current_arch = opts['architecture']; var current_hw = opts['hardwareAcceleration']; - + var valid = Object.getOwnPropertyNames(validCombos); - + //os section for(var i =0; ipip install torch-ort
python -m torch_ort.configure", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/ onnxruntime-training
pip install torch-ort
python -m torch_ort.configure", "ot_linux,ot_large_model,ot_python,ot_X64,ot_CUDA118,ot_nightly": - "pip install --pre onnxruntime-training --extra-index-url=https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/
pip install torch-ort
python -m torch_ort.configure", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ onnxruntime-training
pip install torch-ort
python -m torch_ort.configure", "ot_linux,ot_large_model,ot_python,ot_X64,ot_ROCm,ot_stable": "pip install onnxruntime-training -f https://download.onnxruntime.ai/onnxruntime_stable_<rocm_version*>.html
pip install torch-ort
python -m torch_ort.configure

*Available versions", - + "ot_linux,ot_large_model,ot_python,ot_X64,ot_ROCm,ot_nightly": "pip install onnxruntime-training -f https://download.onnxruntime.ai/onnxruntime_nightly_<rocm_version*>.html
pip install torch-ort
python -m torch_ort.configure

*Available versions", - + "ot_linux,ot_on_device,ot_python,ot_X64,ot_CPU,ot_stable": - "pip install --pre onnxruntime-training-cpu --extra-index-url=https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/ onnxruntime-training-cpu", "ot_linux,ot_on_device,ot_python,ot_X64,ot_CPU,ot_nightly": - "pip install --pre onnxruntime-training-cpu --extra-index-url=https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT_Nightly/pypi/simple/", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ onnxruntime-training-cpu", "ot_linux,ot_on_device,ot_python,ot_X64,ot_CUDA118,ot_stable": - "pip install --pre onnxruntime-training --extra-index-url=https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/
pip install torch-ort
python -m torch_ort.configure", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/ onnxruntime-training
pip install torch-ort
python -m torch_ort.configure", "ot_linux,ot_on_device,ot_python,ot_X64,ot_CUDA118,ot_nightly": - "pip install --pre onnxruntime-training --extra-index-url=https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/
pip install torch-ort
python -m torch_ort.configure", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ onnxruntime-training
pip install torch-ort
python -m torch_ort.configure", "ot_linux,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_stable": "Download .tgz file from Github
Refer to docs for requirements.", - + "ot_linux,ot_on_device,ot_csharp,ot_X64,ot_CPU,ot_stable": "Install Nuget package Microsoft.ML.OnnxRuntime.Training", @@ -617,7 +616,7 @@ var ot_validCombos = { "ot_linux,ot_on_device,ot_cplusplus,ot_X64,ot_CUDA118,ot_stable": "Follow build instructions from here", - + "ot_linux,ot_on_device,ot_csharp,ot_X64,ot_CUDA118,ot_stable": "Follow build instructions from here", @@ -625,10 +624,10 @@ var ot_validCombos = { "Download .tgz file from Github
Refer to docs for requirements.", "ot_windows,ot_on_device,ot_python,ot_X64,ot_CPU,ot_stable": - "pip install --pre onnxruntime-training-cpu --extra-index-url=https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/ onnxruntime-training-cpu", "ot_windows,ot_on_device,ot_python,ot_X64,ot_CPU,ot_nightly": - "pip install --pre onnxruntime-training-cpu --extra-index-url=https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT_Nightly/pypi/simple/", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ onnxruntime-training-cpu", "ot_windows,ot_on_device,ot_python,ot_X64,ot_CUDA118,ot_stable": "Follow build instructions from here", @@ -647,7 +646,7 @@ var ot_validCombos = { "ot_windows,ot_on_device,ot_cplusplus,ot_X64,ot_CUDA118,ot_stable": "Follow build instructions from here", - + "ot_windows,ot_on_device,ot_csharp,ot_X64,ot_CUDA118,ot_stable": "Follow build instructions from here", @@ -656,7 +655,7 @@ var ot_validCombos = { "ot_android,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_stable": "Follow installation instructions from here", - + "ot_android,ot_on_device,ot_java,ot_X64,ot_CPU,ot_stable": "Add a dependency on com.microsoft.onnxruntime:onnxruntime-training-android using Maven/Gradle and refer to the instructions here.", @@ -665,34 +664,33 @@ var ot_validCombos = { "ot_android,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_nightly": "Follow build instructions from here", - + "ot_android,ot_on_device,ot_java,ot_X64,ot_CPU,ot_nightly": "Follow build instructions from here", "ot_mac,ot_on_device,ot_python,ot_X64,ot_CPU,ot_stable": - "pip install --pre onnxruntime-training-cpu --extra-index-url=https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/ onnxruntime-training-cpu", "ot_mac,ot_on_device,ot_python,ot_X64,ot_CPU,ot_nightly": - "pip install --pre onnxruntime-training-cpu --extra-index-url=https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT_Nightly/pypi/simple/", + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ onnxruntime-training-cpu", "ot_ios,ot_on_device,ot_objc,ot_X64,ot_CPU,ot_stable": "Add 'onnxruntime-training-objc' using CocoaPods and refer to the mobile deployment guide", - + "ot_ios,ot_on_device,ot_c,ot_X64,ot_CPU,ot_stable": "Add 'onnxruntime-training-c' using CocoaPods and refer to the mobile deployment guide", - + "ot_ios,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_stable": "Add 'onnxruntime-training-c' using CocoaPods and refer to the mobile deployment guide", - + "ot_ios,ot_on_device,ot_objc,ot_X64,ot_CPU,ot_nightly": "Follow build instructions from here", - + "ot_ios,ot_on_device,ot_c,ot_X64,ot_CPU,ot_nightly": "Follow build instructions from here", - + "ot_ios,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_nightly": "Follow build instructions from here", - }; function ot_commandMessage(key) { @@ -702,12 +700,12 @@ function ot_commandMessage(key) { if(ot_opts['ot_os']=='' || ot_opts['ot_scenario'] == '' || ot_opts['ot_architecture'] == '' || ot_opts['ot_language']=='' || ot_opts['ot_hardwareAcceleration'] == '' || ot_opts['ot_build'] == ''){ $("#ot_command span").html( "Please select a combination of resources" - ) + ) } else if (!ot_validCombos.hasOwnProperty(key)) { $("#ot_command span").html( "This combination is not supported. De-select to make another selection." - ) + ) $("#ot_command").addClass("invalid"); return false; } @@ -720,7 +718,7 @@ function ot_commandMessage(key) { } var validCombos = { - + "windows,C-API,X64,CUDA": "Install Nuget package Microsoft.ML.OnnxRuntime.Gpu
Refer to docs for requirements.", @@ -735,7 +733,7 @@ var validCombos = { "linux,Python,ARM64,CUDA": "For Jetpack 4.4+, follow installation instructions from here", - + "linux,C-API,X64,CUDA": "Download .tgz file from Github
Refer to docs for requirements.", @@ -765,31 +763,31 @@ var validCombos = { "windows,C-API,ARM32,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", - + "windows,C++,ARM32,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", - + "windows,C#,ARM32,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", - + "windows,C-API,ARM64,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", - + "windows,C++,ARM64,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", - + "windows,C#,ARM64,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", - + "windows,C++,X64,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", - + "windows,C++,X86,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", - + "windows,C#,X64,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", - + "windows,C#,X86,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime", @@ -829,7 +827,7 @@ var validCombos = { "windows,C-API,X64,DNNL": "Follow build instructions from here", - "windows,C++,X64,DNNL": + "windows,C++,X64,DNNL": "Follow build instructions from here", "windows,C#,X64,DNNL": @@ -838,7 +836,7 @@ var validCombos = { "windows,Python,X64,DNNL": "Follow build instructions from here", - "linux,C-API,X64,DNNL": + "linux,C-API,X64,DNNL": "Follow build instructions from here", "linux,C++,X64,DNNL": @@ -847,7 +845,7 @@ var validCombos = { "linux,C#,X64,DNNL": "Follow build instructions from here", - "linux,Python,X64,DNNL": + "linux,Python,X64,DNNL": "Follow build instructions from here", "linux,Python,X64,TVM": @@ -858,10 +856,10 @@ var validCombos = { "linux,Python,ARM32,TVM": "Follow build instructions from here", - + "linux,Python,ARM64,TVM": "Follow build instructions from here", - + "windows,Python,X64,TVM": "Follow build instructions from here", @@ -870,10 +868,10 @@ var validCombos = { "windows,Python,ARM32,TVM": "Follow build instructions from here", - + "windows,Python,ARM64,TVM": "Follow build instructions from here", - + "linux,C-API,X64,OpenVINO": "Follow build instructions from here", @@ -930,7 +928,7 @@ var validCombos = { "windows,C-API,X86,DirectML": "Install Nuget package Microsoft.ML.OnnxRuntime.DirectML
Refer to docs for requirements.", - + "windows,C++,X86,DirectML": "Install Nuget package Microsoft.ML.OnnxRuntime.DirectML", @@ -939,65 +937,65 @@ var validCombos = { "windows,Python,X86,DirectML": "Follow build instructions from here", - + "windows,C-API,X64,DirectML": "Install Nuget package Microsoft.ML.OnnxRuntime.DirectML", - + "windows,C++,X64,DirectML": "Install Nuget package Microsoft.ML.OnnxRuntime.DirectML", - + "windows,C#,X64,DirectML": "Install Nuget package Microsoft.ML.OnnxRuntime.DirectML", - + "windows,Python,X64,DirectML": "pip install onnxruntime-directml", - + "windows,C-API,ARM64,DirectML": "Install Nuget package Microsoft.ML.OnnxRuntime.DirectML", - + "windows,C++,ARM64,DirectML": "Install Nuget package Microsoft.ML.OnnxRuntime.DirectML", - + "windows,C#,ARM64,DirectML": "Install Nuget package Microsoft.ML.OnnxRuntime.DirectML", - + "windows,Python,ARM64,DirectML": "Follow build instructions from here", - + "linux,Java,X64,DefaultCPU": "Add a dependency on com.microsoft.onnxruntime:onnxruntime using Maven/Gradle", - + "linux,Java,X64,CUDA": "Add a dependency on com.microsoft.onnxruntime:onnxruntime_gpu using Maven/Gradle.
Refer to docs for requirements.", - + "mac,Java,X64,DefaultCPU": "Add a dependency on com.microsoft.onnxruntime:onnxruntime using Maven/Gradle", //javascript "linux,JS,X64,DefaultCPU": "npm install onnxruntime-node", - + "mac,JS,X64,DefaultCPU": "npm install onnxruntime-node", "windows,JS,X64,DefaultCPU": "npm install onnxruntime-node", - + "web,JS,,": "npm install onnxruntime-web", - + "android,JS,ARM64,DefaultCPU": "npm install onnxruntime-react-native", - + "android,JS,X64,DefaultCPU": "npm install onnxruntime-react-native", - + "android,JS,X86,DefaultCPU": "npm install onnxruntime-react-native", - + "ios,JS,ARM64,DefaultCPU": "npm install onnxruntime-react-native", - + "windows,WinRT,X86,DefaultCPU": "Install Nuget package Microsoft.AI.MachineLearning", @@ -1042,55 +1040,55 @@ var validCombos = { "linux,Java,X64,OpenVINO": "Follow build and API instructions", - + "android,C-API,ARM64,NNAPI": "Follow build instructions from here", - + "android,C++,ARM64,NNAPI": "Follow build instructions from here", - + "android,Java,ARM64,NNAPI": "Add a dependency on com.microsoft.onnxruntime:onnxruntime-android or com.microsoft.onnxruntime:onnxruntime-mobile using Maven/Gradle and refer to the mobile deployment guide", - + "android,C-API,X86,NNAPI": "Follow build instructions from here", - + "android,C++,X86,NNAPI": "Follow build instructions from here", - + "android,C#,X86,NNAPI": "Install Nuget package Microsoft.ML.OnnxRuntime.", - + "android,Java,X64,NNAPI": "Add a dependency on com.microsoft.onnxruntime:onnxruntime-android or com.microsoft.onnxruntime:onnxruntime-mobile using Maven/Gradle and refer to the mobile deployment guide", - + "android,C-API,X64,NNAPI": "Follow build instructions from here", - + "android,C++,X64,NNAPI": "Follow build instructions from here", - + "android,C#,X64,NNAPI": "Install Nuget package Microsoft.ML.OnnxRuntime.", "android,Java,X86,NNAPI": "Add a dependency on com.microsoft.onnxruntime:onnxruntime-android or com.microsoft.onnxruntime:onnxruntime-mobile using Maven/Gradle and refer to the mobile deployment guide", - + "android,C-API,ARM32,NNAPI": "Follow build instructions from here", - + "android,C++,ARM32,NNAPI": "Follow build instructions from here", "android,C#,ARM32,NNAPI": "Install Nuget package Microsoft.ML.OnnxRuntime.", - + "android,Java,ARM32,NNAPI": "Add a dependency on com.microsoft.onnxruntime:onnxruntime-android or com.microsoft.onnxruntime:onnxruntime-mobile using Maven/Gradle and refer to the mobile deployment guide", - + "android,C-API,ARM64,DefaultCPU": "Follow build instructions from here", - + "android,C++,ARM64,DefaultCPU": "Follow build instructions from here", @@ -1099,73 +1097,73 @@ var validCombos = { "android,C-API,ARM32,DefaultCPU": "Follow build instructions from here", - + "android,C++,ARM32,DefaultCPU": "Follow build instructions from here", "android,C#,ARM32,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime.", - + "android,Java,ARM32,DefaultCPU": "Add a dependency on com.microsoft.onnxruntime:onnxruntime-android or com.microsoft.onnxruntime:onnxruntime-mobile using Maven/Gradle and refer to the mobile deployment guide", "android,C-API,X86,DefaultCPU": "Follow build instructions from here", - + "android,C++,X86,DefaultCPU": "Follow build instructions from here", "android,C#,X86,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime.", - + "android,Java,X86,DefaultCPU": "Add a dependency on com.microsoft.onnxruntime:onnxruntime-android or com.microsoft.onnxruntime:onnxruntime-mobile using Maven/Gradle and refer to the mobile deployment guide", - + "android,C-API,X64,DefaultCPU": "Follow build instructions from here", - + "android,C++,X64,DefaultCPU": "Follow build instructions from here", - + "android,C#,X64,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime.", "android,Java,X64,DefaultCPU": "Add a dependency on com.microsoft.onnxruntime:onnxruntime-android or com.microsoft.onnxruntime:onnxruntime-mobile using Maven/Gradle and refer to the mobile deployment guide", - + "android,C#,ARM64,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime.", - + "android,C#,ARM64,NNAPI": "Install Nuget package Microsoft.ML.OnnxRuntime.", - + "ios,C-API,ARM64,DefaultCPU": "Add 'onnxruntime-c' or 'onnxruntime-mobile-c' using CocoaPods and refer to the mobile deployment guide", - + "ios,C++,ARM64,DefaultCPU": "Add 'onnxruntime-c' or 'onnxruntime-mobile-c' using CocoaPods and refer to the mobile deployment guide", - + "ios,C-API,ARM64,CoreML": "Add 'onnxruntime-c' or 'onnxruntime-mobile-c' using CocoaPods and refer to the mobile deployment guide", - + "ios,C++,ARM64,CoreML": "Add 'onnxruntime-c' or 'onnxruntime-mobile-c' using CocoaPods and refer to the mobile deployment guide", - + "ios,objectivec,ARM64,DefaultCPU": "Add 'onnxruntime-objc' or 'onnxruntime-mobile-objc' using CocoaPods and refer to the mobile deployment guide", - + "ios,objectivec,ARM64,CoreML": "Add 'onnxruntime-objc' or 'onnxruntime-mobile-objc' using CocoaPods and refer to the mobile deployment guide", - + "ios,C#,ARM64,DefaultCPU": "Install Nuget package Microsoft.ML.OnnxRuntime.", - + "ios,C#,ARM64,CoreML": "Install Nuget package Microsoft.ML.OnnxRuntime.", - + "windows,Python,X64,VitisAI": "Follow build instructions from here", - + "windows,C++,X64,VitisAI": "Follow build instructions from here", @@ -1174,67 +1172,67 @@ var validCombos = { "linux,Python,ARM64,VitisAI": "Follow build instructions from here", - + "linux,Python,X64,MIGraphX": "Follow build instructions from here", - + "linux,C-API,X64,MIGraphX": "Follow build instructions from here", - + "linux,C++,X64,MIGraphX": "Follow build instructions from here", - + "linux,Python,X64,ROCm": "Follow build instructions from here", - + "linux,C-API,X64,ROCm": "Follow build instructions from here", - + "linux,C++,X64,ROCm": "Follow build instructions from here", "linux,Python,ARM64,ACL": "Follow build instructions from here", - + "linux,C-API,ARM64,ACL": "Follow build instructions from here", - + "linux,C++,ARM64,ACL": "Follow build instructions from here", - + "linux,Python,ARM32,ACL": "Follow build instructions from here", - + "linux,C-API,ARM32,ACL": "Follow build instructions from here", - + "linux,C++,ARM32,ACL": "Follow build instructions from here", - + "linux,Python,ARM64,ArmNN": "Follow build instructions from here", - + "linux,C-API,ARM64,ArmNN": "Follow build instructions from here", - + "linux,C++,ARM64,ArmNN": "Follow build instructions from here", - + "linux,Python,ARM32,ArmNN": "Follow build instructions from here", - + "linux,C-API,ARM32,ArmNN": "Follow build instructions from here", - + "linux,C++,ARM32,ArmNN": "Follow build instructions from here", - + "linux,Python,ARM64,RockchipNPU": "Follow build instructions from here", - + "linux,C-API,ARM64,RockchipNPU": "Follow build instructions from here", - + "linux,C++,ARM64,RockchipNPU": "Follow build instructions from here", @@ -1250,13 +1248,13 @@ var validCombos = { "mac,Java,ARM64,CoreML": "Add a dependency on com.microsoft.onnxruntime:onnxruntime using Maven/Gradle", - + "mac,C-API,ARM64,CoreML": "Install Nuget package Microsoft.ML.OnnxRuntime", "mac,Python,ARM64,DefaultCPU": "pip install onnxruntime", - + "mac,Python,ARM64,DefaultCPU": "pip install onnxruntime", @@ -1275,10 +1273,10 @@ var validCombos = { //power "linux,C-API,Power,DefaultCPU": "Follow build instructions from here", - + "linux,C++,Power,DefaultCPU": "Follow build instructions from here", - + "linux,Python,Power,DefaultCPU": "pip install onnxruntime-powerpc64le", @@ -1288,7 +1286,7 @@ var validCombos = { "windows,C++,ARM64,QNN": "View installation instructions here", - + "windows,C#,ARM64,QNN": "View installation instructions here", @@ -1378,15 +1376,15 @@ function commandMessage(key) { return true; } else if(opts['os']=='' || opts['architecture'] == '' || opts['language']=='' || opts['hardwareAcceleration'] == ''){ - + $("#command span").html( "Please select a combination of resources" - ) + ) } else if (!validCombos.hasOwnProperty(key)) { $("#command span").html( "This combination is not supported. De-select to make another selection." - ) + ) $("#command").addClass("invalid"); return false; } else { @@ -1471,7 +1469,7 @@ function getImage(node) { } function setRadioButton(node, state) { - + var image = getImage(node); if (state == 'true') { node.setAttribute('aria-selected', 'true'); @@ -1502,7 +1500,7 @@ function clickRadioGroup(event) { } function keyDownRadioGroup(event) { - + var type = event.type; var next = false; if (type === "keydown") { @@ -1553,17 +1551,17 @@ function blurRadioButton(event) { var tabpan = $("#" + tabpanid); $("div[role='tabpanel']:not(tabpan)").attr("aria-hidden", "true"); $("div[role='tabpanel']:not(tabpan)").addClass("hidden"); - + tabpan.removeClass("hidden"); tabpan.attr("aria-hidden", "false"); }); - + $(".tbl_tablist li[role='tab']").keydown(function (ev) { if (ev.which == 13) { $(this).click(); } }); - + //This adds keyboard function that pressing an arrow left or arrow right from the tabs toggel the tabs. $(".tbl_tablist li[role='tab']").keydown(function (ev) { if (ev.which == 39 || ev.which == 37) { @@ -1571,12 +1569,12 @@ function blurRadioButton(event) { if (selected == "true") { $("li[aria-selected='false']").attr("aria-selected", "true").focus(); $(this).attr("aria-selected", "false"); - + var tabpanid = $("li[aria-selected='true']").attr("aria-controls"); var tabpan = $("#" + tabpanid); $("div[role='tabpanel']:not(tabpan)").attr("aria-hidden", "true"); $("div[role='tabpanel']:not(tabpan)").addClass("hidden"); - + tabpan.attr("aria-hidden", "false"); tabpan.removeClass("hidden"); } @@ -1617,27 +1615,27 @@ function blurRadioButton(event) { $(function() { var tabs = $(".custom-tab"); - + // For each individual tab DIV, set class and aria role attributes, and hide it $(tabs).find(".tab-content > div.tab-pane").attr({ "class": "tabPanel", "role": "tabpanel", "aria-hidden": "true" }).hide(); - + // Get the list of tab links - var tabsList = tabs.find("ul:first").attr({ + var tabsList = tabs.find("ul:first").attr({ "role": "tablist" }); - + // For each item in the tabs list... $(tabsList).find("li > a").each( function(a) { var tab = $(this); - + // Create a unique id using the tab link's href var tabId = "tab-" + tab.attr("href").slice(1); - + // Assign tab id, aria and tabindex attributes to the tab control, but do not remove the href tab.attr({ "id": tabId, @@ -1645,28 +1643,28 @@ function blurRadioButton(event) { "aria-selected": "false", // "tabindex": "-1" }).parent().attr("role", "presentation"); - + // Assign aria attribute to the relevant tab panel $(tabs).find(".tabPanel").eq(a).attr("aria-labelledby", tabId); - + // Set the click event for each tab link tab.click( function(e) { // Prevent default click event e.preventDefault(); - + // Change state of previously selected tabList item $(tabsList).find("> li.active").removeClass("active").find("> a").attr({ "aria-selected": "false", // "tabindex": "-1" }); - + // Hide previously selected tabPanel $(tabs).find(".tabPanel:visible").attr("aria-hidden", "true").hide(); - + // Show newly selected tabPanel $(tabs).find(".tabPanel").eq(tab.parent().index()).attr("aria-hidden", "false").show(); - + // Set state of newly selected tab list item tab.attr({ "aria-selected": "true", @@ -1677,7 +1675,7 @@ function blurRadioButton(event) { ); } ); - + // Set keydown events on tabList item for navigating tabs $(tabsList).delegate("a", "keydown", function(e) { @@ -1702,10 +1700,10 @@ function blurRadioButton(event) { } } ); - + // Show the first tabPanel $(tabs).find(".tabPanel:first").attr("aria-hidden", "false").show(); - + // Set state for the first tabsList li $(tabsList).find("li:first").addClass("active").find(" > a").attr({ "aria-selected": "true",