From 4df2fbc38f5a4de379ad8c50775037616b029f56 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Thu, 17 Jul 2014 16:45:46 -0400 Subject: [PATCH] Schedules / Activity Stream Changed status_change to schedule_change in schedules socket on test page. Started fixing activity stream brokeness. --- awx/ui/static/js/controllers/Sockets.js | 2 +- awx/ui/static/js/widgets/Stream.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/ui/static/js/controllers/Sockets.js b/awx/ui/static/js/controllers/Sockets.js index 545db44ae4..2d94f40f0e 100644 --- a/awx/ui/static/js/controllers/Sockets.js +++ b/awx/ui/static/js/controllers/Sockets.js @@ -91,7 +91,7 @@ function SocketsController ($scope, $compile, ClearScope, Socket) { test_scope.messages.push(data); }); - schedules_socket.on("status_changed", function(data) { + schedules_socket.on("schedule_changed", function(data) { schedules_scope.messages.push(data); }); diff --git a/awx/ui/static/js/widgets/Stream.js b/awx/ui/static/js/widgets/Stream.js index 536b024c4b..31ff0f4c08 100644 --- a/awx/ui/static/js/widgets/Stream.js +++ b/awx/ui/static/js/widgets/Stream.js @@ -19,9 +19,9 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti // Try not to overlap footer. Because stream is positioned absolute, the parent // doesn't resize correctly when stream is loaded. var sheight = $('#stream-content').height(), - theight = parseInt($('#tab-content-container').css('min-height').replace(/px/, '')), + theight = parseInt($('#main-view').css('min-height').replace(/px/, '')), height = (theight < sheight) ? sheight : theight; - $('#tab-content-container').css({ + $('#main-view').css({ "min-height": height }); }; @@ -79,7 +79,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti stream.detach(); stream.empty(); stream.unbind(); - $('#tab-content-container').css({ + $('#main-view').css({ 'min-height': 0 }); //let the parent height go back to normal }, 500);