RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-11 17:49:24 +03:00
Code Issues Projects Releases Wiki Activity

attribute tweaks

Browse Source
This commit is contained in:
Igor Vaynberg 2019-06-26 23:12:18 -07:00
parent 1d8cef3430
commit b7e016fd5d
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bridge/src/select25.tsx
View File

@ -7,7 +7,7 @@ import '../../control/src/select25.scss';
import { SingleSelect } from '../../control/src/single-select'; import { SingleSelect } from '../../control/src/single-select';
import { extend } from '../../control/src/util'; import { extend } from '../../control/src/util';
import { Ajax, createQueryFromAjax } from './ajax'; import { Ajax, createQueryFromAjax } from './ajax';
import { DataFunction, createQueryFromData } from './data'; import { createQueryFromData, DataFunction } from './data';
import { Store } from './store'; import { Store } from './store';
const forceImportOfH = h; const forceImportOfH = h;
@ -224,21 +224,21 @@ function create<T>(element: HTMLInputElement, options: Options) {
options.tabIndex = element.tabIndex; options.tabIndex = element.tabIndex;
} }
if (element.getAttribute('s25-style')) { if (element.getAttribute('data-s25-container-style')) {
let style = options.containerStyle || ''; let style = options.containerStyle || '';
if (style.length > 0) { if (style.length > 0) {
style += ';'; style += ';';
} }
style += element.getAttribute('s25-style'); style += element.getAttribute('data-s25-container-style');
options.containerStyle = style; options.containerStyle = style;
} }
if (element.getAttribute('s25-class')) { if (element.getAttribute('data-s25-container-class')) {
let clazz = options.containerClass || ''; let clazz = options.containerClass || '';
if (clazz.length > 0) { if (clazz.length > 0) {
clazz += ' '; clazz += ' ';
} }
clazz += element.getAttribute('s25-class'); clazz += element.getAttribute('data-s25-container-class');
options.containerClass = clazz; options.containerClass = clazz;
} }

2
control/src/multi-select.tsx
View File

@ -166,7 +166,7 @@ export class MultiSelect extends AbstractSelect<Props, State> {
); );
})} })}
<label htmlFor={undefined} className={style.offscreen}> <label htmlFor={undefined} className={style.offscreen}>
{props.comboboxLabel} {comboboxLabel}
</label> </label>
<input <input
type='text' type='text'

1
control/src/result-list.tsx
View File

@ -59,7 +59,6 @@ export class ResultList extends Component<Props> {
onScroll={this.onScroll} onScroll={this.onScroll}
class={style.searchResults} class={style.searchResults}
aria-busy={props.loading} aria-busy={props.loading}
style={{ maxHeight: '175px' }}
> >
{props.loading && ( {props.loading && (
<div class={cn(style.searchResultsLoading, style.searchResultsMessage)}> <div class={cn(style.searchResultsLoading, style.searchResultsMessage)}>

1
control/src/select25.scss
View File

@ -218,6 +218,7 @@ $dropdown-padding: 8px 10px;
overflow-y: auto; overflow-y: auto;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
max-height: 175px;
} }
.s25-options { .s25-options {

3
control/src/style.ts
View File

@ -27,5 +27,6 @@ export const enum style {
searchResultsMinimumError = 's25-search-results-minimum-error', searchResultsMinimumError = 's25-search-results-minimum-error',
hiddenAccessible = 's25-hidden-accessible', hiddenAccessible = 's25-hidden-accessible',
hidden = 's25-hidden', hidden = 's25-hidden',
placeholder = 's25-placeholder' placeholder = 's25-placeholder',
scroll = 's25-scroll'
} }

2
dev/index.html
View File

@ -33,7 +33,7 @@
<input type="text" value="focus grabber 3" /> <input type="text" value="focus grabber 3" />
</p> </p>
<section> <section>
<input type="hidden" id="colors" s25-style="width:450px" /> <input type="hidden" id="colors" data-s25-container-style="width:450px" />
</section> </section>
<p> <p>