diff --git a/awx/ui/static/js/lists/CompletedJobs.js b/awx/ui/static/js/lists/CompletedJobs.js index dc7fc5e3a0..fea6d78ada 100644 --- a/awx/ui/static/js/lists/CompletedJobs.js +++ b/awx/ui/static/js/lists/CompletedJobs.js @@ -70,8 +70,7 @@ export default label: 'Name', columnClass: 'col-md-3 col-sm-4 col-xs-4', ngClick: "viewJobLog(completed_job.id, completed_job.nameHref)", - defaultSearchField: true, - awToolTipEllipses: "{{ completed_job.name }}" + defaultSearchField: true }, failed: { label: 'Job failed?', diff --git a/awx/ui/static/js/lists/QueuedJobs.js b/awx/ui/static/js/lists/QueuedJobs.js index c47d12f393..72ceb16b8e 100644 --- a/awx/ui/static/js/lists/QueuedJobs.js +++ b/awx/ui/static/js/lists/QueuedJobs.js @@ -62,8 +62,7 @@ export default label: 'Name', columnClass: 'col-md-3 col-sm-4 col-xs-4', ngClick: "viewJobLog(queued_job.id, queued_job.nameHref)", - defaultSearchField: true, - awToolTipEllipses: "{{ queued_job.name }}" + defaultSearchField: true } }, diff --git a/awx/ui/static/js/lists/RunningJobs.js b/awx/ui/static/js/lists/RunningJobs.js index 81951cb114..f66361cf35 100644 --- a/awx/ui/static/js/lists/RunningJobs.js +++ b/awx/ui/static/js/lists/RunningJobs.js @@ -63,8 +63,7 @@ export default label: 'Name', columnClass: 'col-md-3 col-sm-4 col-xs-4', ngClick: "viewJobLog(running_job.id, running_job.nameHref)", - defaultSearchField: true, - awToolTipEllipses: "{{ running_job.name }}" + defaultSearchField: true } }, diff --git a/awx/ui/static/js/shared/directives.js b/awx/ui/static/js/shared/directives.js index c131dc1a1f..4e6b5d3951 100644 --- a/awx/ui/static/js/shared/directives.js +++ b/awx/ui/static/js/shared/directives.js @@ -449,45 +449,6 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job }; }]) - /* - * This is a copy of awToolTip currently. - * TODO: only display these tool tips if the length of the anchor *as interpolated* to be larger than the table cell - */ - .directive('awToolTipEllipses', [ function() { - return { - link: function(scope, element, attrs) { - - var delay = (attrs.delay !== undefined && attrs.delay !== null) ? attrs.delay : ($AnsibleConfig) ? $AnsibleConfig.tooltip_delay : {show: 500, hide: 100}, - placement; - - if (attrs.awTipPlacement) { - placement = attrs.awTipPlacement; - } - else { - placement = (attrs.placement !== undefined && attrs.placement !== null) ? attrs.placement : 'left'; - } - - $(element).on('hidden.bs.tooltip', function( ) { - // TB3RC1 is leaving behind tooltip
elements. This will remove them - // after a tooltip fades away. If not, they lay overtop of other elements and - // honk up the page. - $('.tooltip').each(function() { - $(this).remove(); - }); - }); - - $(element).tooltip({ - placement: placement, - delay: delay, - html: true, - title: attrs.awToolTipEllipses, - container: 'body', - trigger: 'hover focus' - }); - } - }; - }]) - /* * Enable TB pop-overs. To add a pop-over to an element, include the following directive in * the element's attributes: diff --git a/awx/ui/static/js/shared/generator-helpers.js b/awx/ui/static/js/shared/generator-helpers.js index 25f7324833..fdb584cd8b 100644 --- a/awx/ui/static/js/shared/generator-helpers.js +++ b/awx/ui/static/js/shared/generator-helpers.js @@ -442,12 +442,6 @@ angular.module('GeneratorHelpers', [systemStatus.name]) html += (field.dataTipWatch) ? Attr(field, 'dataTipWatch') : ""; html += (field.awTipPlacement) ? Attr(field, 'awTipPlacement') : ""; } - if (field.awToolTipEllipses) { - html += Attr(field, 'awToolTipEllipses'); - html += (field.dataPlacement && !field.awPopOver) ? Attr(field, 'dataPlacement') : ""; - html += (field.dataTipWatch) ? Attr(field, 'dataTipWatch') : ""; - html += (field.awTipPlacement) ? Attr(field, 'awTipPlacement') : ""; - } if (field.awPopOver) { html += "aw-pop-over=\"" + field.awPopOver + "\" "; html += (field.dataPlacement) ? "data-placement=\"" + field.dataPlacement + "\" " : "";