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

Split getAndSetEditorSetting method into getEditorSetting and setEditorLanguage method

Browse source
This commit is contained in:
Mina Lee 2016-10-19 17:41:14 +09:00
parent 575467055f
commit 359dc0b67b
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -705,7 +705,7 @@
}
};
var getAndSetEditorSetting = function(session, interpreterName) {
var getEditorSetting = function(interpreterName) {
var deferred = $q.defer();
websocketMsgSrv.getEditorSetting($scope.paragraph.id, interpreterName);
$timeout(
@ -715,13 +715,14 @@
}
}
), 1000);
deferred.promise.then(function(editorSetting) {
if (!_.isEmpty(editorSetting.editor)) {
var mode = 'ace/mode/' + editorSetting.editor.language;
$scope.paragraph.config.editorMode = mode;
session.setMode(mode);
}
});
return deferred.promise;
};
var setEditorLanguage = function(session, language) {
var mode = 'ace/mode/';
mode += language;
$scope.paragraph.config.editorMode = mode;
session.setMode(mode);
};
var setParagraphMode = function(session, paragraphText, pos) {
@ -739,14 +740,22 @@
if (!paragraphText.startsWith('%') && ((typeof pos !== 'undefined') && pos.row === 0 && pos.column === 1) ||
(typeof pos === 'undefined') && $scope.$parent.interpreterBindings.length !== 0) {
magic = $scope.$parent.interpreterBindings[0].name;
getAndSetEditorSetting(session, magic);
getEditorSetting(magic)
.then(function(editorSetting) {
if (!_.isEmpty(editorSetting.editor)) {
setEditorLanguage(session, editorSetting.editor.language);
}
});
} else {
var replNameRegexp = /%(.+?)\s/g;
var match = replNameRegexp.exec(paragraphText);
if (match && $scope.magic !== match[1]) {
magic = match[1].trim();
$scope.magic = magic;
getAndSetEditorSetting(session, magic);
getEditorSetting(magic)
.then(function(editorSetting) {
setEditorLanguage(session, editorSetting.editor.language);
});
}
}
}