Skip to content

Move ng-class to new class and workaround for ng-class bug #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bry4n wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move ng-class to new class and workaround for ng-class bug #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/scripts/rx-data-table.src.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,13 @@ app.directive('rxDataTable', function ($http, $timeout, $document, $filter, $par
var classValue = classFunction(row);

if (!_.isEmpty(classValue)) {
classes[classValue] = true;
if (_.isArray(classValue)) {
_.map(classValue, function (className) {
classes[className] = true;
});
} else {
classes[classValue] = true;
}
}
} else if (_.has(column, 'ng-class') && _.isObject(column['ng-class'])) {
classes = angular.extend(classes, column['ng-class']);
Expand Down
70 changes: 36 additions & 34 deletions src/templates/rx-data-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,43 +101,45 @@
<div class="prefix-container" ng-if="shouldHaveRowPrefix(row)" ng-bind-html="rowPrefix()(row)">
</div>
</div>
<div class="data-cell flex-columns-{{ column.cols }} data-column-{{ $index + 1}} {{ column.class }}" ng-repeat="column in getConfig()" data-title="{{ column.title }}" ng-class="getNGClass(column, row)" ng-mouseenter="cellMouseEnter($event)" ng-mouseleave="cellMouseLeave($event)">
<div ng-if="column.checkbox" class="checkbox">
<input type="checkbox" value="{{ row[column.dataField] }}" ng-click="clickAction('{{ row[column.dataField] }}')" id="checkbox_{{ row[column.dataField] }}">
</div>
<div ng-if="column.menu" class="menu-column">
<button class="menu-toggle btn-link" ng-click="toggleMenu(row, column)">
<i ng-if="!column.menu.icon" class="fa fa-cog fa-lg"></i>
<i ng-if="column.menu.icon" class="fa" ng-class="column.menu.icon"></i>
</button>
<ul class="menu-items" ng-show="isMenuShown(row, column)">
<li class="menu-item" ng-repeat="menuItem in column.menu.items">
<button class="btn-link" ng-class="menuItem.class" ng-click="executeAction(row, menuItem)">
<i ng-if="menuItem.icon" class="fa" ng-class="menuItem.icon"></i>
<span class="menu-item-text">{{ menuItem.text }}</span>
</button>
</li>
</ul>
</div>
<div ng-if="!column.checkbox && !column.menu">
<i ng-repeat="icon in iconUnwrap(column, row, 'i')" class="data-table-cell-icon {{ icon.name }}" tooltip="{{ icon.tooltip.text }}" tooltip-placement="{{ (icon.tooltip.placement) ? icon.tooltip.placement : 'top' }}"></i>
<div ng-repeat="icon in iconUnwrap(column, row, 'div')" class="data-table-cell-icon {{ icon.class }}" alt="{{ icon.alt }}" tooltip="{{ icon.tooltip.text }}" tooltip-placement="{{ (icon.tooltip.placement) ? icon.tooltip.placement : 'top' }}"></div>
<span ng-if="buildContent(row, column)" class="data-cell-content" ng-bind-html="buildContent(row, column)"></span>
<a ng-if="!buildContent(row, column) && buildLink(row, column) && hasValue(row, column)" href="{{ buildLink(row, column) }}" class="data-cell-content" target="{{ (column.linkTarget) ? column.linkTarget : '_blank' }}">{{ row | ColumnValue:column }}</a>
<span ng-if="!buildContent(row, column) && !buildLink(row, column) && hasValue(row, column)" class="data-cell-content">
<span ng-if="!allowEditing(column,row)">{{ row | ColumnValue:column:false }}</span>
<span ng-if="allowEditing(column,row)" class="data-editable">
<span ng-switch="getEditType(column, row)">
<span ng-switch-when="select" class="data-editable-field" editable-select="row[column.dataField]" e-ng-options="o.value as o.text for o in getEditableOptions(column, row)" buttons="no" onbeforesave="updateField(column, row, $data, this)">{{ row | ColumnValue:column }}</span>
<span ng-switch-when="typeahead" class="data-editable-field" editable-text="row[column.dataField]" e-typeahead="o.value as o.text for o in getEditableOptions(column, row, $viewValue) | filter:$viewValue" e-typeahead-on-select="updateField(column, row, $data, this)" buttons="no" onshow="getEditableOptions(column, row)">{{ row | ColumnValue:column }}</span>
<!-- Same as ng-switch-when="text" -->
<span ng-switch-default class="data-editable-field" editable-text="row[column.dataField]" onbeforesave="updateField(column, row, $data, this)">{{ row | ColumnValue:column }}</span>
<button class="data-table-field-nullable btn-link" ng-if="column.editable.nullable" ng-click="nullField(column, row, this)" title="Remove {{ column.title }} Value">
<i class="fa fa-times fa-lg"></i>
<div class="data-cell flex-columns-{{ column.cols }} data-column-{{ $index + 1}} {{ column.class }}" ng-repeat="column in getConfig()" data-title="{{ column.title }}" ng-mouseenter="cellMouseEnter($event)" ng-mouseleave="cellMouseLeave($event)">
<div ng-class="getNGClass(column, row)">
<div ng-if="column.checkbox" class="checkbox">
<input type="checkbox" value="{{ row[column.dataField] }}" ng-click="clickAction('{{ row[column.dataField] }}')" id="checkbox_{{ row[column.dataField] }}">
</div>
<div ng-if="column.menu" class="menu-column">
<button class="menu-toggle btn-link" ng-click="toggleMenu(row, column)">
<i ng-if="!column.menu.icon" class="fa fa-cog fa-lg"></i>
<i ng-if="column.menu.icon" class="fa" ng-class="column.menu.icon"></i>
</button>
<ul class="menu-items" ng-show="isMenuShown(row, column)">
<li class="menu-item" ng-repeat="menuItem in column.menu.items">
<button class="btn-link" ng-class="menuItem.class" ng-click="executeAction(row, menuItem)">
<i ng-if="menuItem.icon" class="fa" ng-class="menuItem.icon"></i>
<span class="menu-item-text">{{ menuItem.text }}</span>
</button>
</li>
</ul>
</div>
<div ng-if="!column.checkbox && !column.menu">
<i ng-repeat="icon in iconUnwrap(column, row, 'i')" class="data-table-cell-icon {{ icon.name }}" tooltip="{{ icon.tooltip.text }}" tooltip-placement="{{ (icon.tooltip.placement) ? icon.tooltip.placement : 'top' }}"></i>
<div ng-repeat="icon in iconUnwrap(column, row, 'div')" class="data-table-cell-icon {{ icon.class }}" alt="{{ icon.alt }}" tooltip="{{ icon.tooltip.text }}" tooltip-placement="{{ (icon.tooltip.placement) ? icon.tooltip.placement : 'top' }}"></div>
<span ng-if="buildContent(row, column)" class="data-cell-content" ng-bind-html="buildContent(row, column)"></span>
<a ng-if="!buildContent(row, column) && buildLink(row, column) && hasValue(row, column)" href="{{ buildLink(row, column) }}" class="data-cell-content" target="{{ (column.linkTarget) ? column.linkTarget : '_blank' }}">{{ row | ColumnValue:column }}</a>
<span ng-if="!buildContent(row, column) && !buildLink(row, column) && hasValue(row, column)" class="data-cell-content">
<span ng-if="!allowEditing(column,row)">{{ row | ColumnValue:column:false }}</span>
<span ng-if="allowEditing(column,row)" class="data-editable">
<span ng-switch="getEditType(column, row)">
<span ng-switch-when="select" class="data-editable-field" editable-select="row[column.dataField]" e-ng-options="o.value as o.text for o in getEditableOptions(column, row)" buttons="no" onbeforesave="updateField(column, row, $data, this)">{{ row | ColumnValue:column }}</span>
<span ng-switch-when="typeahead" class="data-editable-field" editable-text="row[column.dataField]" e-typeahead="o.value as o.text for o in getEditableOptions(column, row, $viewValue) | filter:$viewValue" e-typeahead-on-select="updateField(column, row, $data, this)" buttons="no" onshow="getEditableOptions(column, row)">{{ row | ColumnValue:column }}</span>
<!-- Same as ng-switch-when="text" -->
<span ng-switch-default class="data-editable-field" editable-text="row[column.dataField]" onbeforesave="updateField(column, row, $data, this)">{{ row | ColumnValue:column }}</span>
<button class="data-table-field-nullable btn-link" ng-if="column.editable.nullable" ng-click="nullField(column, row, this)" title="Remove {{ column.title }} Value">
<i class="fa fa-times fa-lg"></i>
</button>
</span>
</span>
</span>
</span>
</div>
</div>
</div>
<div class="data-row-expander" ng-if="showRowDetails">
Expand Down