From 83ebeec87b6e614f2b870e37326015a9ed468346 Mon Sep 17 00:00:00 2001 From: KIRAN KASHALKAR Date: Thu, 20 Apr 2017 10:59:43 -0400 Subject: [PATCH] NOTICKET: Fix issues caused by merge Signed-off-by: KIRAN KASHALKAR --- skyquake/framework/core/api_utils/sockets.js | 1 + .../framework/widgets/skyquake_container/skyquakeContainer.jsx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/skyquake/framework/core/api_utils/sockets.js b/skyquake/framework/core/api_utils/sockets.js index 2e6779c04..e2e444735 100644 --- a/skyquake/framework/core/api_utils/sockets.js +++ b/skyquake/framework/core/api_utils/sockets.js @@ -92,6 +92,7 @@ Subscriptions.prototype.subscribe = function(req, callback) { var a = url.resolve(origin, req.baseUrl); var b = url.resolve(a, URL); URL = b; + console.log('DEBUG URL IS', URL); } else { protocol = protocol[1] } diff --git a/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx b/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx index 8b61f4b6c..05a42db63 100644 --- a/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx +++ b/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx @@ -18,6 +18,7 @@ import React from 'react'; import AltContainer from 'alt-container'; import Alt from './skyquakeAltInstance.js'; + import _cloneDeep from 'lodash/cloneDeep'; import SkyquakeNav from '../skyquake_nav/skyquakeNav.jsx'; import EventCenter from './eventCenter.jsx'; import SkyquakeContainerActions from './skyquakeContainerActions.js' @@ -92,7 +93,7 @@ export default class skyquakeContainer extends React.Component { render() { const {displayNotification, notificationMessage, displayScreenLoader, notificationType, ...state} = this.state; var html; - let nav = _.cloneDeep(this.state.nav); + let nav = _cloneDeep(this.state.nav); if (this.matchesLoginUrl()) { html = ( -- 2.17.1