Skip to content

Commit

Permalink
Merge pull request #220 from asitparida/dev
Browse files Browse the repository at this point in the history 
Aria Label Fix
  • Loading branch information
@asitparida
asitparida authored Nov 22, 2016
2 parents 54d0332 + f61c088 commit 48d34e4
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions Source.Vx.Grid/Source.Vx.Grid/dist/min/js/vx.grid.bundle.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Source.Vx.Grid/Source.Vx.Grid/dist/min/js/vx.grid.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Source.Vx.Grid/Source.Vx.Grid/js/vx-grid-min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Source.Vx.Grid/Source.Vx.Grid/js/vx-grid-templates-min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Source.Vx.Grid/Source.Vx.Grid/js/vx-grid-templates.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Source.Vx.Grid/Source.Vx.Grid/js/vx-grid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@
var cellHolderTmpl = '<td class="vxBodyRowCell VX_TD_CLASS" scope="VX_CELL_SCOPE">VX_CELL_CONTENT</td>';
var emptyRowTempl = '<td colspan="VX_NON_HIDDEN_COL_LEN" style="padding-left:15px;"><span>VX_EMPTYFILL</span></td>';
var cellTmplContent = '<span title="VX_CELL_TMPL">VX_CELL_TMPL</span>';
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>';
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>';
var allCells = '';
var _classes = '';
var rowId = row[$scope.vxColSettings.primaryId];
Expand Down Expand Up @@ -865,7 +865,7 @@
_cellTmpl = cellTmplRowSelect;
_cellTmpl = _cellTmpl.replaceAll('VX_ROW_ID', rowId);
_cellTmpl = _cellTmpl.replace('VX_ROW_SEL_VAL', _rowSelectData == true ? 'checked' : '');
_cellTmpl = _cellTmpl.replace('VX_CONFIG_ROW_SEL_ID', $scope.vxConfig.selectRowID);
//_cellTmpl = _cellTmpl.replace('VX_CONFIG_ROW_SEL_ID', $scope.vxConfig.selectRowID);
//_compile = _compile || true;
}
else if (col.renderHybridCellDefn == true && typeof $scope.vxConfig.hybridCellDefn === 'function') {
Expand Down
12 changes: 6 additions & 6 deletions Source.Vx.Grid/Source.Vx.Grid/resource/vx-grid-templates.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,8 @@
<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>
<div ng-if="header.columnIsRowSelect == true">
<div class="vx-row-select">
<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}}" />
<span class="offscreen" style="visibility:collapse;" ng-attr-id="vx_row_sel_{{rowId}}">{{rowId}}</span>
<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}}" />
<span class="offscreen" style="visibility:collapse;" ng-attr-id="vx_row_sel_{{rowId}}">Select Row {{rowId}}</span>
</div>
</div>
<div class="vx-row-edit-container" ng-if="header.columnIsRowEdit == true">
Expand All @@ -398,7 +398,7 @@
<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}}">
<i class="icon icon-save"></i>
</div>
<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}}">
<div class="vx-row-edit icon-container loader" tabindex="0" ng-show="vxColSettings.saveInProgress[rowId] == true" role="button">
<img class="loader-row" ng-src="{{vxConfig.loaderGifSrc}}" />
</div>
</div>
Expand Down Expand Up @@ -436,8 +436,8 @@
<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>
<div ng-if="::header.columnIsRowSelect == true">
<div class="vx-row-select">
<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}}" />
<span class="offscreen" style="visibility:collapse;" ng-attr-id="vx_row_sel_{{rowId}}">{{rowId}}</span>
<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}}" />
<span class="offscreen" style="visibility:collapse;" ng-attr-id="vx_row_sel_{{rowId}}">Select row {{rowId}}</span>
</div>
</div>
<div class="vx-row-edit-container" ng-if="::header.columnIsRowEdit == true">
Expand All @@ -447,7 +447,7 @@
<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}}">
<i class="icon icon-save"></i>
</div>
<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}}">
<div class="vx-row-edit icon-container loader" tabindex="0" ng-show="vxColSettings.saveInProgress[rowId] == true" role="button">
<img class="loader-row" ng-src="{{::vxConfig.loaderGifSrc}}" />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Source.Vx.Grid/Source.Vx.Grid/resource/vx-grid-templates.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Source.Vx.Grid/Source.Vx.Grid/resource/vx-grid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@
var cellHolderTmpl = '<td class="vxBodyRowCell VX_TD_CLASS" scope="VX_CELL_SCOPE">VX_CELL_CONTENT</td>';
var emptyRowTempl = '<td colspan="VX_NON_HIDDEN_COL_LEN" style="padding-left:15px;"><span>VX_EMPTYFILL</span></td>';
var cellTmplContent = '<span title="VX_CELL_TMPL">VX_CELL_TMPL</span>';
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>';
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>';
var allCells = '';
var _classes = '';
var rowId = row[$scope.vxColSettings.primaryId];
Expand Down Expand Up @@ -865,7 +865,7 @@
_cellTmpl = cellTmplRowSelect;
_cellTmpl = _cellTmpl.replaceAll('VX_ROW_ID', rowId);
_cellTmpl = _cellTmpl.replace('VX_ROW_SEL_VAL', _rowSelectData == true ? 'checked' : '');
_cellTmpl = _cellTmpl.replace('VX_CONFIG_ROW_SEL_ID', $scope.vxConfig.selectRowID);
//_cellTmpl = _cellTmpl.replace('VX_CONFIG_ROW_SEL_ID', $scope.vxConfig.selectRowID);
//_compile = _compile || true;
}
else if (col.renderHybridCellDefn == true && typeof $scope.vxConfig.hybridCellDefn === 'function') {
Expand Down
6 changes: 3 additions & 3 deletions dist/vx.grid.bundle.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/vx.grid.min.js
View file

Large diffs are not rendered by default.

0 comments on commit 48d34e4

Please sign in to comment.