Skip to content

Commit 48d34e4

Browse files
asitparidaasitparida
authored
Merge pull request #220 from asitparida/dev
Aria Label Fix
2 parents 54d0332 + f61c088 commit 48d34e4

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

‎Source.Vx.Grid/Source.Vx.Grid/dist/min/js/vx.grid.bundle.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source.Vx.Grid/Source.Vx.Grid/dist/min/js/vx.grid.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source.Vx.Grid/Source.Vx.Grid/js/vx-grid-min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source.Vx.Grid/Source.Vx.Grid/js/vx-grid-templates-min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source.Vx.Grid/Source.Vx.Grid/js/vx-grid-templates.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source.Vx.Grid/Source.Vx.Grid/js/vx-grid.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@
837837
var cellHolderTmpl = '<td class="vxBodyRowCell VX_TD_CLASS" scope="VX_CELL_SCOPE">VX_CELL_CONTENT</td>';
838838
var emptyRowTempl = '<td colspan="VX_NON_HIDDEN_COL_LEN" style="padding-left:15px;"><span>VX_EMPTYFILL</span></td>';
839839
var cellTmplContent = '<span title="VX_CELL_TMPL">VX_CELL_TMPL</span>';
840-
var cellTmplRowSelect = '<div class="vx-row-select"><input class="vx-row-select-toggle" rowid="VX_ROW_ID" type="checkbox" VX_ROW_SEL_VAL id="vx_row-sel_in_VX_ROW_ID" aria-labelledby="VX_CONFIG_ROW_SEL_ID vx_row_sel_VX_ROW_ID" /><span class="offscreen" style="visibility:collapse;" id="vx_row_sel_VX_ROW_ID">VX_ROW_ID</span></div>';
840+
var cellTmplRowSelect = '<div class="vx-row-select"><input class="vx-row-select-toggle" rowid="VX_ROW_ID" type="checkbox" VX_ROW_SEL_VAL id="vx_row-sel_in_VX_ROW_ID" aria-labelledby="vx_row_sel_VX_ROW_ID" /><span class="offscreen" style="visibility:collapse;" id="vx_row_sel_VX_ROW_ID">Select row VX_ROW_ID</span></div>';
841841
var allCells = '';
842842
var _classes = '';
843843
var rowId = row[$scope.vxColSettings.primaryId];
@@ -865,7 +865,7 @@
865865
_cellTmpl = cellTmplRowSelect;
866866
_cellTmpl = _cellTmpl.replaceAll('VX_ROW_ID', rowId);
867867
_cellTmpl = _cellTmpl.replace('VX_ROW_SEL_VAL', _rowSelectData == true ? 'checked' : '');
868-
_cellTmpl = _cellTmpl.replace('VX_CONFIG_ROW_SEL_ID', $scope.vxConfig.selectRowID);
868+
//_cellTmpl = _cellTmpl.replace('VX_CONFIG_ROW_SEL_ID', $scope.vxConfig.selectRowID);
869869
//_compile = _compile || true;
870870
}
871871
else if (col.renderHybridCellDefn == true && typeof $scope.vxConfig.hybridCellDefn === 'function') {

‎Source.Vx.Grid/Source.Vx.Grid/resource/vx-grid-templates.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@
387387
<div ng-if="header.columnIsDate != true && header.columnIsRowSelect != true && header.columnIsRowEdit != true && vxColSettings.inlineEditState[row[vxColSettings.primaryId]] == true && header.inlineEditOnColumnEnabled == true" vx-compile-clone-link="header.editDefn"></div>
388388
<div ng-if="header.columnIsRowSelect == true">
389389
<div class="vx-row-select">
390-
<input class="vx-row-select-toggle" type="checkbox" ng-model="vxColSettings.rowSelected[rowId]" ng-change="rowSelectionChanged(rowId)" ng-disabled="vxColSettings.vxRowSelectionDisable[rowId]" ng-attr-id="vx_row-sel_in{{rowId}}" aria-labelledby="{{::vxConfig.selectRowID}} vx_row_sel_{{rowId}}" />
391-
<span class="offscreen" style="visibility:collapse;" ng-attr-id="vx_row_sel_{{rowId}}">{{rowId}}</span>
390+
<input class="vx-row-select-toggle" type="checkbox" ng-model="vxColSettings.rowSelected[rowId]" ng-change="rowSelectionChanged(rowId)" ng-disabled="vxColSettings.vxRowSelectionDisable[rowId]" ng-attr-id="vx_row-sel_in{{rowId}}" aria-labelledby="vx_row_sel_{{rowId}}" />
391+
<span class="offscreen" style="visibility:collapse;" ng-attr-id="vx_row_sel_{{rowId}}">Select Row {{rowId}}</span>
392392
</div>
393393
</div>
394394
<div class="vx-row-edit-container" ng-if="header.columnIsRowEdit == true">
@@ -398,7 +398,7 @@
398398
<div class="vx-row-edit icon-container" ax-disabled="vxConfig.invalidRows[row[vxColSettings.primaryId]]" tabindex="0" ax-key="saveRow(rowId)" ng-show="vxColSettings.inlineEditState[rowId] == true && vxColSettings.saveInProgress[rowId] != true" role="button" aria-labelledby="{{::vxConfig.saveRowID}} vx_row_sel_{{rowId}}">
399399
<i class="icon icon-save"></i>
400400
</div>
401-
<div class="vx-row-edit icon-container loader" tabindex="0" ng-show="vxColSettings.saveInProgress[rowId] == true" role="button" aria-labelledby="{{::vxConfig.selectRowID}} vx_row_sel_{{rowId}}">
401+
<div class="vx-row-edit icon-container loader" tabindex="0" ng-show="vxColSettings.saveInProgress[rowId] == true" role="button">
402402
<img class="loader-row" ng-src="{{vxConfig.loaderGifSrc}}" />
403403
</div>
404404
</div>
@@ -436,8 +436,8 @@
436436
<div ng-if="::header.columnIsDate != true && header.columnIsRowSelect != true && header.columnIsRowEdit != true && vxColSettings.inlineEditState[row[vxColSettings.primaryId]] == true && header.inlineEditOnColumnEnabled == true" vx-compile-clone-link="header.editDefn"></div>
437437
<div ng-if="::header.columnIsRowSelect == true">
438438
<div class="vx-row-select">
439-
<input class="vx-row-select-toggle" type="checkbox" ng-model="vxColSettings.rowSelected[rowId]" ng-change="rowSelectionChanged(rowId)" ng-disabled="vxColSettings.vxRowSelectionDisable[rowId]" ng-attr-id="vx_row-sel_in{{::rowId}}" aria-labelledby="{{::vxConfig.selectRowID}} vx_row_sel_{{::rowId}}" />
440-
<span class="offscreen" style="visibility:collapse;" ng-attr-id="vx_row_sel_{{rowId}}">{{rowId}}</span>
439+
<input class="vx-row-select-toggle" type="checkbox" ng-model="vxColSettings.rowSelected[rowId]" ng-change="rowSelectionChanged(rowId)" ng-disabled="vxColSettings.vxRowSelectionDisable[rowId]" ng-attr-id="vx_row-sel_in{{::rowId}}" aria-labelledby="vx_row_sel_{{::rowId}}" />
440+
<span class="offscreen" style="visibility:collapse;" ng-attr-id="vx_row_sel_{{rowId}}">Select row {{rowId}}</span>
441441
</div>
442442
</div>
443443
<div class="vx-row-edit-container" ng-if="::header.columnIsRowEdit == true">
@@ -447,7 +447,7 @@
447447
<div class="vx-row-edit icon-container" ax-disabled="vxConfig.invalidRows[row[vxColSettings.primaryId]]" tabindex="0" ax-key="saveRow(rowId)" ng-show="vxColSettings.inlineEditState[rowId] == true && vxColSettings.saveInProgress[rowId] != true" role="button" aria-labelledby="{{::vxConfig.saveRowID}} vx_row_sel_{{::rowId}}">
448448
<i class="icon icon-save"></i>
449449
</div>
450-
<div class="vx-row-edit icon-container loader" tabindex="0" ng-show="vxColSettings.saveInProgress[rowId] == true" role="button" aria-labelledby="{{::vxConfig.selectRowID}} vx_row_sel_{{::rowId}}">
450+
<div class="vx-row-edit icon-container loader" tabindex="0" ng-show="vxColSettings.saveInProgress[rowId] == true" role="button">
451451
<img class="loader-row" ng-src="{{::vxConfig.loaderGifSrc}}" />
452452
</div>
453453
</div>

‎Source.Vx.Grid/Source.Vx.Grid/resource/vx-grid-templates.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source.Vx.Grid/Source.Vx.Grid/resource/vx-grid.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@
837837
var cellHolderTmpl = '<td class="vxBodyRowCell VX_TD_CLASS" scope="VX_CELL_SCOPE">VX_CELL_CONTENT</td>';
838838
var emptyRowTempl = '<td colspan="VX_NON_HIDDEN_COL_LEN" style="padding-left:15px;"><span>VX_EMPTYFILL</span></td>';
839839
var cellTmplContent = '<span title="VX_CELL_TMPL">VX_CELL_TMPL</span>';
840-
var cellTmplRowSelect = '<div class="vx-row-select"><input class="vx-row-select-toggle" rowid="VX_ROW_ID" type="checkbox" VX_ROW_SEL_VAL id="vx_row-sel_in_VX_ROW_ID" aria-labelledby="VX_CONFIG_ROW_SEL_ID vx_row_sel_VX_ROW_ID" /><span class="offscreen" style="visibility:collapse;" id="vx_row_sel_VX_ROW_ID">VX_ROW_ID</span></div>';
840+
var cellTmplRowSelect = '<div class="vx-row-select"><input class="vx-row-select-toggle" rowid="VX_ROW_ID" type="checkbox" VX_ROW_SEL_VAL id="vx_row-sel_in_VX_ROW_ID" aria-labelledby="vx_row_sel_VX_ROW_ID" /><span class="offscreen" style="visibility:collapse;" id="vx_row_sel_VX_ROW_ID">Select row VX_ROW_ID</span></div>';
841841
var allCells = '';
842842
var _classes = '';
843843
var rowId = row[$scope.vxColSettings.primaryId];
@@ -865,7 +865,7 @@
865865
_cellTmpl = cellTmplRowSelect;
866866
_cellTmpl = _cellTmpl.replaceAll('VX_ROW_ID', rowId);
867867
_cellTmpl = _cellTmpl.replace('VX_ROW_SEL_VAL', _rowSelectData == true ? 'checked' : '');
868-
_cellTmpl = _cellTmpl.replace('VX_CONFIG_ROW_SEL_ID', $scope.vxConfig.selectRowID);
868+
//_cellTmpl = _cellTmpl.replace('VX_CONFIG_ROW_SEL_ID', $scope.vxConfig.selectRowID);
869869
//_compile = _compile || true;
870870
}
871871
else if (col.renderHybridCellDefn == true && typeof $scope.vxConfig.hybridCellDefn === 'function') {

‎dist/vx.grid.bundle.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)