Repository: incubator-zeppelin Updated Branches: refs/heads/master 703b47f79 -> cbef1be48
ZEPPELIN-247: fix; navbar.controller.js used to assumes WebSocket connection as disconnected. ZEPPELIN-247: fix; navbar.controller.js used to assumes WebSocket connection as disconnected. It should get the state from WebSocketService. Author: Prabhjyot Singh <[email protected]> Closes #236 from prabhjyotsingh/ZEPPELIN-247 and squashes the following commits: 1646530 [Prabhjyot Singh] ZEPPELIN-247: fix; navbar.controller.js used to assumes WebSocket connection as disconnected. It should get the state from WebSocketService. Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/cbef1be4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/cbef1be4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/cbef1be4 Branch: refs/heads/master Commit: cbef1be485329357f9540e1efb64e5bd5bdcf792 Parents: 703b47f Author: Prabhjyot Singh <[email protected]> Authored: Fri Aug 21 11:48:01 2015 +0530 Committer: Lee moon soo <[email protected]> Committed: Sat Aug 22 11:51:50 2015 -0700 ---------------------------------------------------------------------- .../src/components/navbar/navbar.controller.js | 22 ++++++++++---------- .../websocketEvents/websocketEvents.factory.js | 4 ++++ .../websocketEvents/websocketMsg.service.js | 4 ++++ 3 files changed, 19 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/cbef1be4/zeppelin-web/src/components/navbar/navbar.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js index 0aa24ef..19db448 100644 --- a/zeppelin-web/src/components/navbar/navbar.controller.js +++ b/zeppelin-web/src/components/navbar/navbar.controller.js @@ -17,20 +17,20 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootScope, $routeParams, notebookListDataFactory, websocketMsgSrv) { /** Current list of notes (ids) */ - + var vm = this; vm.notes = notebookListDataFactory; - vm.connected = false; + vm.connected = websocketMsgSrv.isConnected(); vm.websocketMsgSrv = websocketMsgSrv; - - $('#notebook-list').perfectScrollbar({suppressScrollX: true}); - + + $('#notebook-list').perfectScrollbar({suppressScrollX : true}); + $scope.$on('setNoteMenu', function(event, notes) { - notebookListDataFactory.setNotes(notes); + notebookListDataFactory.setNotes(notes); }); - + $scope.$on('setConnectedStatus', function(event, param) { - vm.connected = param; + vm.connected = param; }); function loadNotes() { @@ -40,10 +40,10 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco function isActive(noteId) { return ($routeParams.noteId === noteId); } - + vm.loadNotes = loadNotes; vm.isActive = isActive; - + vm.loadNotes(); - + }); http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/cbef1be4/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js b/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js index f18e774..b490f7d 100644 --- a/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js +++ b/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js @@ -32,6 +32,10 @@ angular.module('zeppelinWebApp').factory('websocketEvents', function($rootScope, websocketCalls.ws.send(JSON.stringify(data)); }; + websocketCalls.isConnected = function() { + return (websocketCalls.ws.socket.readyState === 1); + }; + websocketCalls.ws.onMessage(function(event) { var payload; if (event.data) { http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/cbef1be4/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js b/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js index e14c17a..1323462 100644 --- a/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js +++ b/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js @@ -107,6 +107,10 @@ angular.module('zeppelinWebApp').service('websocketMsgSrv', function($rootScope, params: paragraphParams } }); + }, + + isConnected: function(){ + return websocketEvents.isConnected(); } };
