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/11/15 21:44:19 UTC
nifi git commit: [NIFI-3042] Update class name for disabled combo
option. This closes #1228
Repository: nifi
Updated Branches:
refs/heads/master 9f3bf121f -> 81357d445
[NIFI-3042] Update class name for disabled combo option. This closes #1228
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/81357d44
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/81357d44
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/81357d44
Branch: refs/heads/master
Commit: 81357d4456037aa081a5ed76d146299a78bc2449
Parents: 9f3bf12
Author: Scott Aslan <sc...@gmail.com>
Authored: Tue Nov 15 15:59:23 2016 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Nov 15 16:43:27 2016 -0500
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css | 2 +-
.../nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/81357d44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
index 1494a16..b68d1a4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
@@ -77,7 +77,7 @@ div.selected-disabled-option {
padding: 0px 10px;
}
-.combo-options ul > li.disabled {
+.combo-options ul > li.disabled-option {
font-style: italic;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/81357d44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
index 2bc406b..9873651 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
@@ -188,7 +188,7 @@
// this is option is enabled register appropriate listeners
if (option.disabled === true) {
- optionElement.addClass('unset disabled');
+ optionElement.addClass('unset disabled-option');
} else {
optionElement.click(function () {
//remove active styles