Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bug fixed for page refresh initialize editor mode

Browse source
This commit is contained in:
CloverHearts 2016-09-28 17:32:45 +09:00
parent 46ecf77b7b
commit eaa1b86978
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file

@ -1595,9 +1595,11 @@ public class NotebookServer extends WebSocketServlet implements
private void getEditorSetting(NotebookSocket conn, Message fromMessage)
throws IOException {
String orderId = (String) fromMessage.get("orderId");
String replName = (String) fromMessage.get("magic");
String noteId = getOpenNoteId(conn);
Message resp = new Message(OP.EDITOR_SETTING);
resp.put("orderId", orderId);
resp.put("editor", notebook().getInterpreterFactory().getEditorSetting(noteId, replName));
conn.send(serializeMessage(resp));
return;

8
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file

@ -705,13 +705,15 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
var getAndSetEditorSetting = function(session, interpreterName) {
var deferred = $q.defer();
websocketMsgSrv.getEditorSetting(interpreterName);
websocketMsgSrv.getEditorSetting($scope.paragraph.id, interpreterName);
$timeout(
$scope.$on('editorSetting', function(event, data) {
deferred.resolve(data);
if ($scope.paragraph.id === data.orderId) {
deferred.resolve(data);
}
}
), 1000);
deferred.promise.then(function(editorSetting) {
if (!_.isEmpty(editorSetting.editor)) {
var mode = 'ace/mode/' + editorSetting.editor.language;

3
zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
View file

@ -180,10 +180,11 @@ angular.module('zeppelinWebApp').service('websocketMsgSrv', function($rootScope,
});
},
getEditorSetting: function(replName) {
getEditorSetting: function(orderId, replName) {
websocketEvents.sendNewEvent({
op: 'EDITOR_SETTING',
data: {
orderId: orderId,
magic: replName
}
});