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

Take care paragraphs scope angular object

Browse source
This commit is contained in:
Lee moon soo 2016-01-01 01:02:49 -08:00
parent 9d24a3bcd2
commit f2fa3476a4
4 changed files with 84 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zeppelin-web/src/app/app.controller.js
View file

@ -14,7 +14,7 @@
'use strict';
angular.module('zeppelinWebApp').controller('MainCtrl', function($scope, $rootScope, $window) {
$rootScope.compiledScope = $scope.$new(true, $rootScope);
$rootScope.notebookScope = $scope.$new(true, $rootScope);
$scope.looknfeel = 'default';
var init = function() {

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

@ -627,8 +627,8 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl',
};
$scope.$on('angularObjectUpdate', function(event, data) {
if (data.noteId === $scope.note.id) {
var scope = $rootScope.compiledScope;
if (data.noteId === $scope.note.id && !data.paragraphId) {
var scope = $rootScope.notebookScope;
var varName = data.angularObject.name;
if (angular.equals(data.angularObject.object, scope[varName])) {
@ -650,7 +650,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl',
angularObjectRegistry[varName].skipEmit = false;
return;
}
websocketMsgSrv.updateAngularObject($routeParams.noteId, varName, newValue, angularObjectRegistry[varName].interpreterGroupId);
websocketMsgSrv.updateAngularObject($routeParams.noteId, undefined, varName, newValue, angularObjectRegistry[varName].interpreterGroupId);
});
}
scope[varName] = data.angularObject.object;
@ -658,8 +658,8 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl',
});
$scope.$on('angularObjectRemove', function(event, data) {
if (!data.noteId || data.noteId === $scope.note.id) {
var scope = $rootScope.compiledScope;
if (!data.noteId || (data.noteId === $scope.note.id && !data.paragraphId)) {
var scope = $rootScope.notebookScope;
var varName = data.name;
// clear watcher

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

@ -17,10 +17,12 @@
angular.module('zeppelinWebApp')
.controller('ParagraphCtrl', function($scope,$rootScope, $route, $window, $element, $routeParams, $location,
$timeout, $compile, websocketMsgSrv) {
var ANGULAR_FUNCTION_OBJECT_NAME_PREFIX = '_Z_ANGULAR_FUNC_';
$scope.paragraph = null;
$scope.originalText = '';
$scope.editor = null;
var paragraphScope = $rootScope.notebookScope.$new(false, $rootScope.notebookScope);
var angularObjectRegistry = {};
var editorModes = {
'ace/mode/scala': /^%spark/,
@ -82,7 +84,7 @@ angular.module('zeppelinWebApp')
try {
angular.element('#p'+$scope.paragraph.id+'_angular').html($scope.paragraph.result.msg);
$compile(angular.element('#p'+$scope.paragraph.id+'_angular').contents())($rootScope.compiledScope);
$compile(angular.element('#p'+$scope.paragraph.id+'_angular').contents())(paragraphScope);
} catch(err) {
console.log('ANGULAR rendering error %o', err);
}
@ -94,6 +96,78 @@ angular.module('zeppelinWebApp')
};
$scope.$on('angularObjectUpdate', function(event, data) {
if (data.noteId && data.paragraphId === $scope.paragraph.id) {
var scope = paragraphScope;
var varName = data.angularObject.name;
if (angular.equals(data.angularObject.object, scope[varName])) {
// return when update has no change
return;
}
if (!angularObjectRegistry[varName]) {
angularObjectRegistry[varName] = {
interpreterGroupId : data.interpreterGroupId,
noteId : data.noteId,
paragraphId : data.paragraphId
};
}
angularObjectRegistry[varName].skipEmit = true;
if (!angularObjectRegistry[varName].clearWatcher) {
angularObjectRegistry[varName].clearWatcher = scope.$watch(varName, function(newValue, oldValue) {
if (angularObjectRegistry[varName].skipEmit) {
angularObjectRegistry[varName].skipEmit = false;
return;
}
websocketMsgSrv.updateAngularObject(
angularObjectRegistry[varName].noteId,
angularObjectRegistry[varName].paragraphId,
varName,
newValue,
angularObjectRegistry[varName].interpreterGroupId);
});
}
scope[varName] = data.angularObject.object;
// create proxy for AngularFunction
if (varName.startsWith(ANGULAR_FUNCTION_OBJECT_NAME_PREFIX)) {
var funcName = varName.substring((ANGULAR_FUNCTION_OBJECT_NAME_PREFIX).length);
scope[funcName] = function() {
scope[varName] = arguments;
console.log('angular function invoked %o', arguments);
};
console.log('angular function created %o', scope[funcName]);
}
}
});
$scope.$on('angularObjectRemove', function(event, data) {
if (!data.noteId || data.noteId && data.paragraphId === $scope.paragraph.id) {
var scope = paragraphScope;
var varName = data.name;
// clear watcher
if (angularObjectRegistry[varName]) {
angularObjectRegistry[varName].clearWatcher();
angularObjectRegistry[varName] = undefined;
}
// remove scope variable
scope[varName] = undefined;
// remove proxy for AngularFunction
if (varName.startsWith(ANGULAR_FUNCTION_OBJECT_NAME_PREFIX)) {
var funcName = varName.substring((ANGULAR_FUNCTION_OBJECT_NAME_PREFIX).length);
scope[funcName] = undefined;
}
}
});
var initializeDefault = function() {
var config = $scope.paragraph.config;

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

@ -57,11 +57,12 @@ angular.module('zeppelinWebApp').service('websocketMsgSrv', function($rootScope,
websocketEvents.sendNewEvent({ op: 'INSERT_PARAGRAPH', data : {index: newIndex}});
},
updateAngularObject: function(noteId, name, value, interpreterGroupId) {
updateAngularObject: function(noteId, paragraphId, name, value, interpreterGroupId) {
websocketEvents.sendNewEvent({
op: 'ANGULAR_OBJECT_UPDATED',
data: {
noteId: noteId,
paragraphId: paragraphId,
name: name,
value: value,
interpreterGroupId: interpreterGroupId