You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by ah...@apache.org on 2017/01/10 07:10:10 UTC
zeppelin git commit: [ZEPPELIN-1731] Fix unexpected EditOnDoubleClick
Repository: zeppelin
Updated Branches:
refs/heads/master afcf575d6 -> d96a14913
[ZEPPELIN-1731] Fix unexpected EditOnDoubleClick
### What is this PR for?
This PR fixes wrong `EditOnDoubleClick` value in editor setting when default bound interpreter has changed.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
[ZEPPELIN-1731](https://issues.apache.org/jira/browse/ZEPPELIN-1731)
### How should this be tested?
1. Set default interpreter to `md`.
2. Write below code in first paragraph and execute the paragraph. The editor should be hidden when you run.
```
## abc
pwd
```
3. Double click the result to make editor to be shown.
4. Change default interpreter to `sh`. At this point syntax highlight on `## abc` should be changed from blue to green.
5. Execute paragraph and see if editor stays displayed.
### Screenshots (if appropriate)
**Before**
**After**
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Mina Lee <mi...@apache.org>
Closes #1850 from minahlee/ZEPPELIN-1731 and squashes the following commits:
ae6c4aa [Mina Lee] Handle the case '%foo' followed by whitespaces
6e62708 [Mina Lee] Fix unexpected EditOnDoubleClick
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d96a1491
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d96a1491
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d96a1491
Branch: refs/heads/master
Commit: d96a14913889292fd2b214d52c265cf4ed4bc5ae
Parents: afcf575
Author: Mina Lee <mi...@apache.org>
Authored: Mon Jan 9 17:45:08 2017 +0900
Committer: ahyoungryu <ah...@apache.org>
Committed: Tue Jan 10 16:10:02 2017 +0900
----------------------------------------------------------------------
zeppelin-web/src/app/notebook/notebook.controller.js | 8 ++++++++
.../app/notebook/paragraph/paragraph.controller.js | 14 +++++++++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d96a1491/zeppelin-web/src/app/notebook/notebook.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
index 791eff3..82b070a 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -582,6 +582,14 @@
}
websocketMsgSrv.saveInterpreterBindings($scope.note.id, selectedSettingIds);
console.log('Interpreter bindings %o saved', selectedSettingIds);
+
+ _.forEach($scope.note.paragraphs, function(n, key) {
+ var regExp = /^\s*%/g;
+ if (n.text && !regExp.exec(n.text)) {
+ $scope.$broadcast('saveInterpreterBindings', n.id);
+ }
+ });
+
$scope.showSetting = false;
};
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d96a1491/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index aedfdf4..431ec94 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -43,7 +43,10 @@
$scope.editor = null;
var editorSetting = {};
+ // flag that is used to set editor setting on paste percent sign
var pastePercentSign = false;
+ // flag that is used to set editor setting on save interpreter bindings
+ var setInterpreterBindings = false;
var paragraphScope = $rootScope.$new(true, $rootScope);
// to keep backward compatibility
@@ -661,7 +664,8 @@
if ((typeof pos === 'undefined') || (pos.row === 0 && pos.column < 30) ||
(pos.row === 1 && pos.column === 0) || pastePercentSign) {
// If paragraph loading, use config value if exists
- if ((typeof pos === 'undefined') && $scope.paragraph.config.editorMode) {
+ if ((typeof pos === 'undefined') && $scope.paragraph.config.editorMode &&
+ !setInterpreterBindings) {
session.setMode($scope.paragraph.config.editorMode);
} else {
var magic = getInterpreterName(paragraphText);
@@ -676,6 +680,7 @@
}
}
pastePercentSign = false;
+ setInterpreterBindings = false;
};
var getInterpreterName = function(paragraphText) {
@@ -1154,6 +1159,13 @@
}
});
+ $scope.$on('saveInterpreterBindings', function(event, paragraphId) {
+ if ($scope.paragraph.id === paragraphId) {
+ setInterpreterBindings = true;
+ setParagraphMode($scope.editor.getSession(), $scope.editor.getSession().getValue());
+ }
+ });
+
$scope.$on('doubleClickParagraph', function(event, paragraphId) {
if ($scope.paragraph.id === paragraphId && $scope.paragraph.config.editorHide &&
$scope.paragraph.config.editorSetting.editOnDblClick && $scope.revisionView !== true) {