You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/07/14 18:50:33 UTC
nifi git commit: [NIFI-2227] fix race condition for showing the view
button on the flow file details dialog [NIFI-2109] update check boxes
[NIFI-2226] reset controller services properties table size on dialog open
This closes #653
Repository: nifi
Updated Branches:
refs/heads/master 2540573d7 -> 02784b5fc
[NIFI-2227] fix race condition for showing the view button on the flow file details dialog
[NIFI-2109] update check boxes
[NIFI-2226] reset controller services properties table size on dialog open
This closes #653
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/02784b5f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/02784b5f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/02784b5f
Branch: refs/heads/master
Commit: 02784b5fcae02dabfdf6902e9c712ddb6205c0a8
Parents: 2540573
Author: Scott Aslan <ja...@hortonworks.com>
Authored: Thu Jul 14 11:57:22 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Jul 14 14:50:14 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/images/inputCheckbox.png | Bin 389 -> 322 bytes
.../nf-ng-canvas-global-menu-controller.js | 1 +
.../js/nf/canvas/nf-controller-service.js | 4 +
.../webapp/js/nf/canvas/nf-queue-listing.js | 111 +++++++++----------
4 files changed, 60 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/02784b5f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png
old mode 100755
new mode 100644
index 1f6a7e5..d3175cf
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/02784b5f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js
index ed4a4b1..e7d96c5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js
@@ -284,6 +284,7 @@ nf.ng.Canvas.GlobalMenuCtrl = function (serviceProvider) {
// store the content viewer url if available
if (!nf.Common.isBlank(aboutDetails.contentViewerUrl)) {
$('#nifi-content-viewer-url').text(aboutDetails.contentViewerUrl);
+ nf.QueueListing.initFlowFileDetailsDialog();
}
}).fail(nf.Common.handleAjaxError);
http://git-wip-us.apache.org/repos/asf/nifi/blob/02784b5f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
index adec624..b6c375b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
@@ -1837,6 +1837,8 @@ nf.ControllerService = (function () {
// show the border if necessary
updateReferencingComponentsBorder(referenceContainer);
+
+ $('#controller-service-properties').propertytable('resetTableSize');
}).fail(nf.Common.handleAjaxError);
},
@@ -1952,6 +1954,8 @@ nf.ControllerService = (function () {
// show the border if necessary
updateReferencingComponentsBorder(referenceContainer);
+
+ $('#controller-service-properties').propertytable('resetTableSize');
});
},
http://git-wip-us.apache.org/repos/asf/nifi/blob/02784b5f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
index 24d7495..49d20d1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
@@ -167,61 +167,6 @@ nf.QueueListing = (function () {
};
/**
- * Initializes the flowfile details dialog.
- */
- var initFlowFileDetailsDialog = function () {
- $('#content-download').on('click', downloadContent);
-
- // only show if content viewer is configured
- if (nf.Common.isContentViewConfigured()) {
- $('#content-view').show();
- $('#content-view').on('click', viewContent);
- }
-
- $('#flowfile-details-tabs').tabbs({
- tabStyle: 'tab',
- selectedTabStyle: 'selected-tab',
- scrollableTabContentStyle: 'scrollable',
- tabs: [{
- name: 'Details',
- tabContentId: 'flowfile-details-tab-content'
- }, {
- name: 'Attributes',
- tabContentId: 'flowfile-attributes-tab-content'
- }]
- });
-
- $('#flowfile-details-dialog').modal({
- scrollableContentStyle: 'scrollable',
- headerText: 'FlowFile',
- buttons: [{
- buttonText: 'Ok',
- color: {
- base: '#728E9B',
- hover: '#004849',
- text: '#ffffff'
- },
- handler: {
- click: function () {
- $('#flowfile-details-dialog').modal('hide');
- }
- }
- }],
- handler: {
- close: function () {
- // clear the details
- $('#flowfile-attributes-container').empty();
- $('#flowfile-cluster-node-id').text('');
- $('#additional-flowfile-details').empty();
- },
- open: function () {
- nf.Common.toggleScrollable($('#' + this.find('.tab-container').attr('id') + '-content').get(0));
- }
- }
- });
- };
-
- /**
* Performs a listing on the specified connection.
*
* @param connection the connection
@@ -497,7 +442,6 @@ nf.QueueListing = (function () {
return {
init: function () {
initializeListingRequestStatusDialog();
- initFlowFileDetailsDialog();
// define mouse over event for the refresh button
$('#queue-listing-refresh-button').click(function () {
@@ -686,6 +630,61 @@ nf.QueueListing = (function () {
},
/**
+ * Initializes the flowfile details dialog.
+ */
+ initFlowFileDetailsDialog: function () {
+ $('#content-download').on('click', downloadContent);
+
+ // only show if content viewer is configured
+ if (nf.Common.isContentViewConfigured()) {
+ $('#content-view').show();
+ $('#content-view').on('click', viewContent);
+ }
+
+ $('#flowfile-details-tabs').tabbs({
+ tabStyle: 'tab',
+ selectedTabStyle: 'selected-tab',
+ scrollableTabContentStyle: 'scrollable',
+ tabs: [{
+ name: 'Details',
+ tabContentId: 'flowfile-details-tab-content'
+ }, {
+ name: 'Attributes',
+ tabContentId: 'flowfile-attributes-tab-content'
+ }]
+ });
+
+ $('#flowfile-details-dialog').modal({
+ scrollableContentStyle: 'scrollable',
+ headerText: 'FlowFile',
+ buttons: [{
+ buttonText: 'Ok',
+ color: {
+ base: '#728E9B',
+ hover: '#004849',
+ text: '#ffffff'
+ },
+ handler: {
+ click: function () {
+ $('#flowfile-details-dialog').modal('hide');
+ }
+ }
+ }],
+ handler: {
+ close: function () {
+ // clear the details
+ $('#flowfile-attributes-container').empty();
+ $('#flowfile-cluster-node-id').text('');
+ $('#additional-flowfile-details').empty();
+ },
+ open: function () {
+ nf.Common.toggleScrollable($('#' + this.find('.tab-container').attr('id') + '-content').get(0));
+ }
+ }
+ });
+ },
+
+ /**
* Update the size of the grid based on its container's current size.
*/
resetTableSize: function () {