Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3502: 

- Preventing digest() during an ongoing apply() or digest() lifecycle.

This closes #2471

Signed-off-by: Scott Aslan <scottyaslan@gmail.com>
This commit is contained in:
Matt Gilman 2018-02-20 14:26:46 -05:00 committed by Scott Aslan
parent bf72d05825
commit ba9e72ed8b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-navigate-controller.js
View File

@ -35,7 +35,7 @@
}(this, function (nfCanvasUtils, nfContextMenu) { }(this, function (nfCanvasUtils, nfContextMenu) {
'use strict'; 'use strict';
return function () { return function ($timeout) {
'use strict'; 'use strict';
function NavigateCtrl() { function NavigateCtrl() {
@ -44,28 +44,36 @@
* Zoom in on the canvas. * Zoom in on the canvas.
*/ */
this.zoomIn = function () { this.zoomIn = function () {
nfCanvasUtils.zoomInCanvas(); $timeout(function () {
nfCanvasUtils.zoomInCanvas();
}, 0);
}; };
/** /**
* Zoom out on the canvas. * Zoom out on the canvas.
*/ */
this.zoomOut = function () { this.zoomOut = function () {
nfCanvasUtils.zoomOutCanvas(); $timeout(function () {
nfCanvasUtils.zoomOutCanvas();
}, 0);
}; };
/** /**
* Zoom fit on the canvas. * Zoom fit on the canvas.
*/ */
this.zoomFit = function () { this.zoomFit = function () {
nfCanvasUtils.fitCanvas(); $timeout(function () {
nfCanvasUtils.fitCanvas();
}, 0);
}; };
/** /**
* Zoom actual size on the canvas. * Zoom actual size on the canvas.
*/ */
this.zoomActualSize = function () { this.zoomActualSize = function () {
nfCanvasUtils.actualSizeCanvas(); $timeout(function () {
nfCanvasUtils.actualSizeCanvas();
}, 0);
}; };
} }

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js
View File

@ -259,7 +259,7 @@
templateComponent.$inject = ['serviceProvider']; templateComponent.$inject = ['serviceProvider'];
labelComponent.$inject = ['serviceProvider']; labelComponent.$inject = ['serviceProvider'];
graphControlsCtrl.$inject = ['serviceProvider', 'navigateCtrl', 'operateCtrl']; graphControlsCtrl.$inject = ['serviceProvider', 'navigateCtrl', 'operateCtrl'];
navigateCtrl.$inject = []; navigateCtrl.$inject = ['$timeout'];
operateCtrl.$inject = []; operateCtrl.$inject = [];
breadcrumbsDirective.$inject = ['breadcrumbsCtrl']; breadcrumbsDirective.$inject = ['breadcrumbsCtrl'];
draggableDirective.$inject = []; draggableDirective.$inject = [];