Skip to content

Fix MultiEvent Catch in Zeppelin #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corneadoug merged 3 commits into from
Feb 9, 2015
Merged

Fix MultiEvent Catch in Zeppelin #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4c63a5
Fix MultiEvent Catch in Zeppelin
corneadoug Feb 6, 2015
2069a73
Change the last rootscope.emit call
corneadoug Feb 7, 2015
5c93f7f
Merge branch 'master' into fix/MultiRun-MultiNewParagraph
corneadoug Feb 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions zeppelin-web/app/scripts/controllers/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,19 @@ angular.module('zeppelinWebApp')
if (event.data) {
payload = angular.fromJson(event.data);
}
console.log('Receive << %o, %o', payload.op, payload);
console.log('Receive << %o, %o, %o', payload.op, payload, $scope);
var op = payload.op;
var data = payload.data;
if (op === 'NOTE') {
$rootScope.$emit('setNoteContent', data.note);
$scope.$broadcast('setNoteContent', data.note);
} else if (op === 'NOTES_INFO') {
$rootScope.$emit('setNoteMenu', data.notes);
$scope.$broadcast('setNoteMenu', data.notes);
} else if (op === 'PARAGRAPH') {
$rootScope.$emit('updateParagraph', data);
$scope.$broadcast('updateParagraph', data);
} else if (op === 'PROGRESS') {
$rootScope.$emit('updateProgress', data);
$scope.$broadcast('updateProgress', data);
} else if (op === 'COMPLETION_LIST') {
$rootScope.$emit('completionList', data);
$scope.$broadcast('completionList', data);
}
});

Expand All @@ -89,6 +89,7 @@ angular.module('zeppelinWebApp')
}
};


/** get the childs event and sebd to the websocket server */
$rootScope.$on('sendNewEvent', function(event, data) {
if (!event.defaultPrevented) {
Expand Down
9 changes: 5 additions & 4 deletions zeppelin-web/app/scripts/controllers/nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* global $:false */
/* Copyright 2014 NFLabs
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -20,7 +21,7 @@
* @description
* # NavCtrl
* Controller of the top navigation, mainly use for the dropdown menu
*
*
* @author anthonycorbacho
*/
angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootScope, $routeParams) {
Expand All @@ -29,7 +30,7 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco
$('#notebook-list').perfectScrollbar({suppressScrollX: true});

/** Set the new menu */
$rootScope.$on('setNoteMenu', function(event, notes) {
$scope.$on('setNoteMenu', function(event, notes) {
$scope.notes = notes;
});

Expand All @@ -42,13 +43,13 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco
$scope.createNewNote = function() {
$rootScope.$emit('sendNewEvent', {op: 'NEW_NOTE'});
};

/** Check if the note url is equal to the current note */
$scope.isActive = function(noteId) {
if ($routeParams.noteId === noteId) {
return true;
}
return false;
};

});
36 changes: 18 additions & 18 deletions zeppelin-web/app/scripts/controllers/notebook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,42 +78,42 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
$scope.runNote = function() {
var result = confirm('Run all paragraphs?');
if (result) {
$rootScope.$emit('runParagraph');
$scope.$broadcast('runParagraph');
}
};

$scope.toggleAllEditor = function() {
if ($scope.editorToggled) {
$rootScope.$emit('closeEditor');
$scope.$broadcast('closeEditor');
} else {
$rootScope.$emit('openEditor');
$scope.$broadcast('openEditor');
}
$scope.editorToggled = !$scope.editorToggled;
};

$scope.showAllEditor = function() {
$rootScope.$emit('openEditor');
$scope.$broadcast('openEditor');
};

$scope.hideAllEditor = function() {
$rootScope.$emit('closeEditor');
$scope.$broadcast('closeEditor');
};

$scope.toggleAllTable = function() {
if ($scope.tableToggled) {
$rootScope.$emit('closeTable');
$scope.$broadcast('closeTable');
} else {
$rootScope.$emit('openTable');
$scope.$broadcast('openTable');
}
$scope.tableToggled = !$scope.tableToggled;
};

$scope.showAllTable = function() {
$rootScope.$emit('openTable');
$scope.$broadcast('openTable');
};

$scope.hideAllTable = function() {
$rootScope.$emit('closeTable');
$scope.$broadcast('closeTable');
};

$scope.isNoteRunning = function() {
Expand Down Expand Up @@ -156,7 +156,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
};

/** update the current note */
$rootScope.$on('setNoteContent', function(event, note) {
$scope.$on('setNoteContent', function(event, note) {
$scope.paragraphUrl = $routeParams.paragraphId;
$scope.asIframe = $routeParams.asIframe;
if ($scope.paragraphUrl) {
Expand Down Expand Up @@ -209,7 +209,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
return noteCopy;
};

$rootScope.$on('moveParagraphUp', function(event, paragraphId) {
$scope.$on('moveParagraphUp', function(event, paragraphId) {
var newIndex = -1;
for (var i=0; i<$scope.note.paragraphs.length; i++) {
if ($scope.note.paragraphs[i].id === paragraphId) {
Expand All @@ -225,7 +225,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
});

// create new paragraph on current position
$rootScope.$on('insertParagraph', function(event, paragraphId) {
$scope.$on('insertParagraph', function(event, paragraphId) {
var newIndex = -1;
for (var i=0; i<$scope.note.paragraphs.length; i++) {
if ($scope.note.paragraphs[i].id === paragraphId) {
Expand All @@ -244,7 +244,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
$rootScope.$emit('sendNewEvent', { op: 'INSERT_PARAGRAPH', data : {index: newIndex}});
});

$rootScope.$on('moveParagraphDown', function(event, paragraphId) {
$scope.$on('moveParagraphDown', function(event, paragraphId) {
var newIndex = -1;
for (var i=0; i<$scope.note.paragraphs.length; i++) {
if ($scope.note.paragraphs[i].id === paragraphId) {
Expand All @@ -259,7 +259,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
$rootScope.$emit('sendNewEvent', { op: 'MOVE_PARAGRAPH', data : {id: paragraphId, index: newIndex}});
});

$rootScope.$on('moveFocusToPreviousParagraph', function(event, currentParagraphId){
$scope.$on('moveFocusToPreviousParagraph', function(event, currentParagraphId){
var focus = false;
for (var i=$scope.note.paragraphs.length-1; i>=0; i--) {
if (focus === false ) {
Expand All @@ -270,14 +270,14 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
} else {
var p = $scope.note.paragraphs[i];
if (!p.config.hide && !p.config.editorHide && !p.config.tableHide) {
$rootScope.$emit('focusParagraph', $scope.note.paragraphs[i].id);
$scope.$broadcast('focusParagraph', $scope.note.paragraphs[i].id);
break;
}
}
}
});

$rootScope.$on('moveFocusToNextParagraph', function(event, currentParagraphId){
$scope.$on('moveFocusToNextParagraph', function(event, currentParagraphId){
var focus = false;
for (var i=0; i<$scope.note.paragraphs.length; i++) {
if (focus === false ) {
Expand All @@ -288,7 +288,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
} else {
var p = $scope.note.paragraphs[i];
if (!p.config.hide && !p.config.editorHide && !p.config.tableHide) {
$rootScope.$emit('focusParagraph', $scope.note.paragraphs[i].id);
$scope.$broadcast('focusParagraph', $scope.note.paragraphs[i].id);
break;
}
}
Expand Down Expand Up @@ -326,7 +326,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
for (var idx in newParagraphIds) {
var newEntry = note.paragraphs[idx];
if (oldParagraphIds[idx] === newParagraphIds[idx]) {
$rootScope.$emit('updateParagraph', {paragraph: newEntry});
$scope.$broadcast('updateParagraph', {paragraph: newEntry});
} else {
// move paragraph
var oldIdx = oldParagraphIds.indexOf(newParagraphIds[idx]);
Expand Down
28 changes: 14 additions & 14 deletions zeppelin-web/app/scripts/controllers/paragraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ angular.module('zeppelinWebApp')
});

// TODO: this may have impact on performance when there are many paragraphs in a note.
$rootScope.$on('updateParagraph', function(event, data) {
$scope.$on('updateParagraph', function(event, data) {
if (data.paragraph.id === $scope.paragraph.id &&
(
data.paragraph.dateCreated !== $scope.paragraph.dateCreated ||
Expand Down Expand Up @@ -238,15 +238,15 @@ angular.module('zeppelinWebApp')
};

$scope.moveUp = function() {
$rootScope.$emit('moveParagraphUp', $scope.paragraph.id);
$scope.$emit('moveParagraphUp', $scope.paragraph.id);
};

$scope.moveDown = function() {
$rootScope.$emit('moveParagraphDown', $scope.paragraph.id);
$scope.$emit('moveParagraphDown', $scope.paragraph.id);
};

$scope.insertNew = function() {
$rootScope.$emit('insertParagraph', $scope.paragraph.id);
$scope.$emit('insertParagraph', $scope.paragraph.id);
};

$scope.removeParagraph = function() {
Expand Down Expand Up @@ -422,7 +422,7 @@ angular.module('zeppelinWebApp')
}
});

$rootScope.$on('completionList', function(event, data) {
$scope.$on('completionList', function(event, data) {
if (data.completions) {
var completions = [];
for (var c in data.completions) {
Expand Down Expand Up @@ -514,14 +514,14 @@ angular.module('zeppelinWebApp')
currentRow = $scope.editor.getCursorPosition().row;
if (currentRow === 0) {
// move focus to previous paragraph
$rootScope.$emit('moveFocusToPreviousParagraph', $scope.paragraph.id);
$scope.$emit('moveFocusToPreviousParagraph', $scope.paragraph.id);
}
} else if (keyCode === 40 || (keyCode === 78 && e.ctrlKey)) { // DOWN
numRows = $scope.editor.getSession().getLength();
currentRow = $scope.editor.getCursorPosition().row;
if (currentRow === numRows-1) {
// move focus to next paragraph
$rootScope.$emit('moveFocusToNextParagraph', $scope.paragraph.id);
$scope.$emit('moveFocusToNextParagraph', $scope.paragraph.id);
}
}
}
Expand Down Expand Up @@ -551,36 +551,36 @@ angular.module('zeppelinWebApp')
return 'Took ' + (timeMs/1000) + ' seconds';
};

$rootScope.$on('updateProgress', function(event, data) {
$scope.$on('updateProgress', function(event, data) {
if (data.id === $scope.paragraph.id) {
$scope.currentProgress = data.progress;
}
});

$rootScope.$on('focusParagraph', function(event, paragraphId) {
$scope.$on('focusParagraph', function(event, paragraphId) {
if ($scope.paragraph.id === paragraphId) {
$scope.editor.focus();
$('body').scrollTo('#'+paragraphId+'_editor', 300, {offset:-60});
}
});

$rootScope.$on('runParagraph', function(event) {
$scope.$on('runParagraph', function(event) {
$scope.runParagraph($scope.editor.getValue());
});

$rootScope.$on('openEditor', function(event) {
$scope.$on('openEditor', function(event) {
$scope.openEditor();
});

$rootScope.$on('closeEditor', function(event) {
$scope.$on('closeEditor', function(event) {
$scope.closeEditor();
});

$rootScope.$on('openTable', function(event) {
$scope.$on('openTable', function(event) {
$scope.openTable();
});

$rootScope.$on('closeTable', function(event) {
$scope.$on('closeTable', function(event) {
$scope.closeTable();
});

Expand Down