BCD & DI AVT - The id "identifier" referenced by the 'for' attribute …

…of a label element is not a valid form input element or an element with id "identifier" is either null or does not exist #1102
eclipse-archived · Aug 23, 2018 · 6b5c5e7 · 6b5c5e7
1 parent 1c42dbb
commit 6b5c5e7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/search/InlineSearchPane.css b/bundles/org.eclipse.orion.client.ui/web/orion/search/InlineSearchPane.css
@@ -197,7 +197,7 @@
 }
 
 .fileNamePatternsHint {
-	color: #777;
+	color: #707070;
 	font-size: 11px;
 	margin: 0 0 2px 0;
 	padding: 0 2px;
@@ -667,6 +667,7 @@
     background-color: inherit;
     margin-top: 8px;
     margin-right: 8px;
+    padding-left: 1px;
 }
 
 .locationElementWrapper:before {
@@ -679,7 +680,7 @@
     font-weight: normal;
     vertical-align: bottom;
     white-space: nowrap;
-    padding-left: 3px;
+    padding-left: 2px;
 }
 
 .locationElementWrapper span {

diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/search/InlineSearchPane.html b/bundles/org.eclipse.orion.client.ui/web/orion/search/InlineSearchPane.html
@@ -8,7 +8,7 @@
 		<div class="searchOptionControlBar">
 			<div class="searchGeneralOptionBlock">
 				<span class="searchOption">
-					<button id="toggleReplaceLink" class="searchOptionControlButton" aria-pressed="false">${Show Replace}</button>
+					<button id="toggleReplaceLink" class="searchOptionControlButton" aria-pressed="false" aria-label="${Replace Mode}">${Show Replace}</button>
 				</span>
 				<span class="searchOption">
 					<button id="advSearchCaseSensitive" class="searchOptionControlButton advSearchCaseSensitive" aria-pressed="false" aria-label="${Case sensitive}"></button>
@@ -24,12 +24,12 @@
 	</div>
 	<div class="searchParamBlockDiv">
 				<div class="searchOptionBlock">
-					<label id="searchScopeLabel" class="searchLabel scopeLabel"></label>
+					<span id="searchScopeLabel" class="searchLabel scopeLabel"></span>
 					<div id="searchScopeInputWrapper" class="searchScopeInputWrapper">
-						<span id="searchScopeElementWrapper" class="searchScopeElementWrapper"></span>
+						<span id="searchScopeElementWrapper" class="searchScopeElementWrapper" role="textbox" tabindex="0" aria-labelledby="searchScopeLabel" aria-readonly="true"></span>
 						<button id="searchScopeSelectButton" class="commandButton core-sprite-outline searchScopeSelectButton" aria-label="${Choose a Folder}"></button>
 					</div>
-					<div>
+					<div role="radiogroup" aria-labelledby="searchScopeLabel">
 						<span class="searchOption">
 							<input type="radio" id="advSearchScopeSelected" name="advSearchScope" value="selected" class="searchRadiobox">
 							<label id="advSearchScopeSelectedLabel" class="searchRadioboxLabel" for="advSearchScopeSelected">${Scope Selected}</label>

diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/search/InlineSearchPane.js b/bundles/org.eclipse.orion.client.ui/web/orion/search/InlineSearchPane.js
@@ -479,7 +479,6 @@ define([
 			label.setAttribute("for", "advSearchInputcomboTextInputField"); //$NON-NLS-1$ //$NON-NLS-0$
 			label = lib.$("#searchScopeLabel", this._searchWrapper);
 			label.appendChild(document.createTextNode(messages["Scope"])); //$NON-NLS-1$ //$NON-NLS-0$
-			label.setAttribute("for", "searchScopeInputcomboTextInputField"); //$NON-NLS-1$ //$NON-NLS-0$
 			label = lib.$("#fileNamePatternsLabel", this._searchWrapper);
 			label.appendChild(document.createTextNode(messages["File name patterns (comma-separated)"])); //$NON-NLS-1$ //$NON-NLS-0$
 			label.setAttribute("for", "fileNamePatternsInputcomboTextInputField"); //$NON-NLS-1$ //$NON-NLS-0$
@@ -609,6 +608,12 @@ define([
 					searchScopeDialog.show();
 				}.bind(this));
 			}.bind(this));
+			this._searchScopeElementWrapper.addEventListener("keypress", function(e) {
+				e.preventDefault();
+				if (e.keyCode === lib.KEY.ENTER) {
+					this._searchScopeSelectButton.click();
+				}
+			}.bind(this));
 			this._searchScopeSelected.addEventListener("change", function(){
 				if(this._searchScopeSelected.checked){
 					this._saveAndUpdateDisplayedScope("selected");

diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/search/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/search/nls/root/messages.js
@@ -18,6 +18,7 @@ define({
 	"Incremental search": "Incremental search",
 	"Whole Word": "Whole Word",
 	"Regular expression": "Regular expression",
+	"Replace Mode": "Replace Mode",
 	"Find after replace": "Find after replace",
 	"Options": "Options",
 	"Find next match": "Find next match",