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

Handle scope correctly

Browse source
This commit is contained in:
Lee moon soo 2016-01-01 10:40:29 -08:00
parent 8d7c07d005
commit 25aea61baf
3 changed files with 12 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -625,52 +625,4 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl',
return true;
}
};
$scope.$on('angularObjectUpdate', function(event, data) {
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])) {
// return when update has no change
return;
}
if (!angularObjectRegistry[varName]) {
angularObjectRegistry[varName] = {
interpreterGroupId : data.interpreterGroupId,
};
}
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($routeParams.noteId, undefined, varName, newValue, angularObjectRegistry[varName].interpreterGroupId);
});
}
scope[varName] = data.angularObject.object;
}
});
$scope.$on('angularObjectRemove', function(event, data) {
if (!data.noteId || (data.noteId === $scope.note.id && !data.paragraphId)) {
var scope = $rootScope.notebookScope;
var varName = data.name;
// clear watcher
if (angularObjectRegistry[varName]) {
angularObjectRegistry[varName].clearWatcher();
angularObjectRegistry[varName] = undefined;
}
// remove scope variable
scope[varName] = undefined;
}
});
});

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

@ -21,7 +21,7 @@ angular.module('zeppelinWebApp')
$scope.paragraph = null;
$scope.originalText = '';
$scope.editor = null;
var paragraphScope = $rootScope.notebookScope.$new(false, $rootScope.notebookScope);
var paragraphScope = $rootScope.$new(true, $rootScope);
var angularObjectRegistry = {};
var editorModes = {
@ -97,7 +97,8 @@ angular.module('zeppelinWebApp')
$scope.$on('angularObjectUpdate', function(event, data) {
if (data.noteId && data.paragraphId === $scope.paragraph.id) {
var noteId = $route.current.pathParams.noteId;
if (!data.noteId || (data.noteId === noteId && (!data.paragraphId || data.paragraphId === $scope.paragraph.id))) {
var scope = paragraphScope;
var varName = data.angularObject.name;
@ -112,12 +113,16 @@ angular.module('zeppelinWebApp')
noteId : data.noteId,
paragraphId : data.paragraphId
};
} else {
angularObjectRegistry[varName].noteId = angularObjectRegistry[varName].noteId || data.noteId;
angularObjectRegistry[varName].paragraphId = angularObjectRegistry[varName].paragraphId || data.paragraphId;
}
angularObjectRegistry[varName].skipEmit = true;
if (!angularObjectRegistry[varName].clearWatcher) {
angularObjectRegistry[varName].clearWatcher = scope.$watch(varName, function(newValue, oldValue) {
console.log('angular object (paragraph) updated %o %o', varName, angularObjectRegistry[varName]);
if (angularObjectRegistry[varName].skipEmit) {
angularObjectRegistry[varName].skipEmit = false;
return;
@ -130,6 +135,7 @@ angular.module('zeppelinWebApp')
angularObjectRegistry[varName].interpreterGroupId);
});
}
console.log('angular object (paragraph) created %o', varName);
scope[varName] = data.angularObject.object;
// create proxy for AngularFunction
@ -137,17 +143,18 @@ angular.module('zeppelinWebApp')
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 (paragraph) invoked %o', arguments);
};
console.log('angular function created %o', scope[funcName]);
console.log('angular function (paragraph) created %o', scope[funcName]);
}
}
});
$scope.$on('angularObjectRemove', function(event, data) {
if (!data.noteId || data.noteId && data.paragraphId === $scope.paragraph.id) {
var noteId = $route.current.pathParams.noteId;
if (!data.noteId || (data.noteId === noteId && (!data.paragraphId || data.paragraphId === $scope.paragraph.id))) {
var scope = paragraphScope;
var varName = data.name;