NIFI-502: - When adding a new property entering into edit mode automatically. - Ensuring the markup for the available actions are appended instead of replaced.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9054dd4e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9054dd4e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9054dd4e Branch: refs/heads/NIFI-271 Commit: 9054dd4e4273846ffd8c24e8ed1b26a6000209b6 Parents: df57555 Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Fri Apr 10 16:07:45 2015 -0400 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Fri Apr 10 16:07:45 2015 -0400 ---------------------------------------------------------------------- .../webapp/js/jquery/propertytable/jquery.propertytable.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9054dd4e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js index 7ffaa3f..ca53709 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js @@ -1015,7 +1015,7 @@ // ensure the configured value is referencing a valid service $.each(propertyDescriptor.allowableValues, function (_, allowableValue) { if (allowableValue.value === dataContext.value) { - markup = '<img src="images/iconGoTo.png" title="Go To" class="go-to-service pointer" style="margin-top: 2px" />'; + markup += '<img src="images/iconGoTo.png" title="Go To" class="go-to-service pointer" style="margin-top: 2px" />'; return false; } }); @@ -1023,7 +1023,7 @@ // allow user defined properties to be removed if (options.readOnly !== true && dataContext.type === 'userDefined') { - markup = '<img src="images/iconDelete.png" title="Delete" class="delete-property pointer" style="margin-top: 2px" />'; + markup += '<img src="images/iconDelete.png" title="Delete" class="delete-property pointer" style="margin-top: 2px" />'; } return markup; @@ -1414,8 +1414,8 @@ // select the new properties row var row = propertyData.getRowById(id); - propertyGrid.setSelectedRows([row]); - propertyGrid.scrollRowIntoView(row); + propertyGrid.setActiveCell(row, propertyGrid.getColumnIndex('value')); + propertyGrid.editActiveCell(); }); } else { nf.Dialog.showOkDialog({