From 0fc502563670a665f1096107f6afa532328b12cf Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Tue, 8 Jul 2014 08:39:54 -0400 Subject: [PATCH] Fixed JS lint errors --- awx/ui/static/js/helpers/HostEventsViewer.js | 16 +++++++++------- awx/ui/static/partials/job_detail.html | 14 +++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/awx/ui/static/js/helpers/HostEventsViewer.js b/awx/ui/static/js/helpers/HostEventsViewer.js index 79c2393dd0..229103acb8 100644 --- a/awx/ui/static/js/helpers/HostEventsViewer.js +++ b/awx/ui/static/js/helpers/HostEventsViewer.js @@ -11,8 +11,8 @@ angular.module('HostEventsViewerHelper', ['ModalDialog', 'Utilities']) - .factory('HostEventsViewer', ['$compile', 'CreateDialog', 'Wait', 'GetBasePath', 'Empty', 'GetEvents', - function($compile, CreateDialog, Wait, GetBasePath, Empty, GetEvents) { + .factory('HostEventsViewer', ['$log', '$compile', 'CreateDialog', 'Wait', 'GetBasePath', 'Empty', 'GetEvents', + function($log, $compile, CreateDialog, Wait, GetBasePath, Empty, GetEvents) { return function(params) { var parent_scope = params.scope, url = params.url, @@ -21,6 +21,8 @@ angular.module('HostEventsViewerHelper', ['ModalDialog', 'Utilities']) title = params.title, //optional scope = parent_scope.$new(true); + $log.debug('host_id: ' + host_id + ' host_name: ' + host_name); + if (scope.removeModalReady) { scope.removeModalReady(); } @@ -33,12 +35,12 @@ angular.module('HostEventsViewerHelper', ['ModalDialog', 'Utilities']) scope.removeJobReady(); } scope.removeEventReady = scope.$on('EventsReady', function(e, data) { - var elem; + //var elem; scope.host_events = data.results; - elem = angular.element(document.getElementById('host-events-modal-dialog')); - $compile(elem)(scope); + //elem = angular.element(document.getElementById('host-events-modal-dialog')); + //$compile(elem)(scope); CreateDialog({ scope: scope, @@ -46,7 +48,7 @@ angular.module('HostEventsViewerHelper', ['ModalDialog', 'Utilities']) height: 600, minWidth: 450, callback: 'ModalReady', - id: 'eventviewer-modal-dialog', + id: 'host-events-modal-dialog', // onResizeStop: resizeText, title: ( (title) ? title : 'Event Details' ), onOpen: function() { @@ -61,7 +63,7 @@ angular.module('HostEventsViewerHelper', ['ModalDialog', 'Utilities']) }); scope.modalOK = function() { - $('#eventviewer-modal-dialog').dialog('close'); + $('#host-events-modal-dialog').dialog('close'); scope.$destroy(); }; }; diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html index a55b5f9334..e16c8c6eaf 100644 --- a/awx/ui/static/partials/job_detail.html +++ b/awx/ui/static/partials/job_detail.html @@ -266,7 +266,7 @@
- +
@@ -280,12 +280,12 @@
-
-
-
{{ host_events.play }}
-
{{ host_events.role }}
-
{{ host_events.task }}
-
{{ host_events.msg }}
+
+
+
{{ event.play }}
+
{{ event.role }}
+
{{ event.task }}
+
{{ event.msg }}