mirror of
https://github.com/ansible/awx.git
synced 2026-05-12 11:57:37 -02:30
[system_tracking] Fix issue with ng-if & truncated-text directives
This commit is contained in:
@@ -2,11 +2,22 @@
|
|||||||
|
|
||||||
function link($compile, scope, element, attrs) {
|
function link($compile, scope, element, attrs) {
|
||||||
|
|
||||||
|
// If the element is a DOM comment, that means
|
||||||
|
// it's been hidden with `ng-if` so don't try
|
||||||
|
// to process it or we get an error!
|
||||||
|
if (element[0].nodeType === 8) {
|
||||||
|
element = element.next();
|
||||||
|
|
||||||
|
// Element was removed due to `ng-if`, so don't
|
||||||
|
// worry about it
|
||||||
|
if (element.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function elementTextWillWrap(element) {
|
function elementTextWillWrap(element) {
|
||||||
|
|
||||||
// If the element is a DOM comment, that means
|
|
||||||
// it's been hidden with `ng-if` so don't try
|
|
||||||
// to process it or we get an error!
|
|
||||||
if (element[0].nodeType === 8) {
|
if (element[0].nodeType === 8) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -26,6 +37,7 @@ function link($compile, scope, element, attrs) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function addTitleIfWrapping(text) {
|
function addTitleIfWrapping(text) {
|
||||||
|
|
||||||
if (elementTextWillWrap(element)) {
|
if (elementTextWillWrap(element)) {
|
||||||
element
|
element
|
||||||
.addClass('u-truncatedText')
|
.addClass('u-truncatedText')
|
||||||
@@ -43,8 +55,6 @@ export default
|
|||||||
['$compile',
|
['$compile',
|
||||||
function($compile) {
|
function($compile) {
|
||||||
return {
|
return {
|
||||||
priority: 1000, // make sure this gets compiled
|
|
||||||
// before `title`
|
|
||||||
link: _.partial(link, $compile)
|
link: _.partial(link, $compile)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,12 +28,12 @@
|
|||||||
<div class="FactDataTable-row FactDataTable-row--flexible" ng-if="group.containsValueArray">
|
<div class="FactDataTable-row FactDataTable-row--flexible" ng-if="group.containsValueArray">
|
||||||
<span class="FactDataTable-column">{{group.facts.keyName}}</span>
|
<span class="FactDataTable-column">{{group.facts.keyName}}</span>
|
||||||
<span class="FactDataTable-column FactDataTable-columnArray">
|
<span class="FactDataTable-column FactDataTable-columnArray">
|
||||||
<span class="FactDataTable-columnMember" ng-repeat="value in group.facts.value1">
|
<span class="FactDataTable-columnMember" truncated-text ng-repeat="value in group.facts.value1">
|
||||||
{{value}}
|
{{value}}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
<span class="FactDataTable-column FactDataTable-columnArray" ng-if="!singleResultView">
|
<span class="FactDataTable-column FactDataTable-columnArray" ng-if="!singleResultView">
|
||||||
<span class="FactDataTable-columnMember" ng-repeat="value in group.facts.value2">
|
<span class="FactDataTable-columnMember" truncated-text ng-repeat="value in group.facts.value2">
|
||||||
{{value}}
|
{{value}}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -63,10 +63,10 @@
|
|||||||
<span class="FactDatum-keyName FactDataTable-column" ng-if="fact.isArrayMember">
|
<span class="FactDatum-keyName FactDataTable-column" ng-if="fact.isArrayMember">
|
||||||
{{fact.keyPath[0]}}.{{fact.keyName}}
|
{{fact.keyPath[0]}}.{{fact.keyName}}
|
||||||
</span>
|
</span>
|
||||||
<span class="FactDatum-value FactDataTable-column u-truncatedText">
|
<span class="FactDatum-value FactDataTable-column" truncated-text>
|
||||||
{{fact.value1}}
|
{{fact.value1}}
|
||||||
</span>
|
</span>
|
||||||
<span class="FactDatum-value FactDataTable-column u-truncatedText" ng-if="!singleResultView">
|
<span class="FactDatum-value FactDataTable-column" truncated-text ng-if="!singleResultView">
|
||||||
{{fact.value2}}
|
{{fact.value2}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user