diff options
author | Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2017-09-19 18:24:06 +0200 |
---|---|---|
committer | Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2017-09-19 18:24:06 +0200 |
commit | 2b15edd224cc6dcff90e170959102eb1a1bb1a50 (patch) | |
tree | 4d43f647565300b70015f4366a0416c98ca40e15 /src/main/resources/META-INF | |
parent | eaea5ad06aa510cbf36bb95c920932ab6de0e6de (diff) |
Removal of useless files & bugfix
Removal of DCAE useless files, and bugfixes SDC calls(+CldsDAO bug), and
insertion of the search engine for Model Properties window in UI
Change-Id: Ia68117bb917807eaf8e8e317f391f90b6d948135
Issue-ID: CLAMP-54
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/main/resources/META-INF')
-rw-r--r-- | src/main/resources/META-INF/resources/designer/scripts/aOnBoot.js | 87 |
1 files changed, 56 insertions, 31 deletions
diff --git a/src/main/resources/META-INF/resources/designer/scripts/aOnBoot.js b/src/main/resources/META-INF/resources/designer/scripts/aOnBoot.js index 01a39b62d..89807d627 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/aOnBoot.js +++ b/src/main/resources/META-INF/resources/designer/scripts/aOnBoot.js @@ -112,37 +112,62 @@ function loadPropertyWindow(type) { } function setMultiSelect() { - $("select").each(function(index, mySelect) { - - var mySelectObj = $(mySelect); - if (! mySelectObj.parents(".multiselect-native-select")) { - // keep native for this one - return; - } - - if (mySelectObj.parents(".multiselect-native-select").length > 0) { - var selectDrop = mySelectObj.parent(".multiselect-native-select").find("select"); - mySelectObj.parent(".multiselect-native-select").parent().html(selectDrop); - } - - var options = { - numberDisplayed: 1, - maxHeight: 200 - }; - - if (mySelectObj.attr("multiple") - && mySelectObj.attr("multiple") != 'false') { - options.includeSelectAllOption = true; - } - - if (mySelectObj.attr("enableFilter") - && mySelectObj.attr("enableFilter") != 'false') { - options.enableCaseInsensitiveFiltering = true; - options.enableFiltering = true; - } - - mySelectObj.multiselect(options); - }); + $("select").each(function(index, mySelect) { + if ($(mySelect).parents(".multiselect-native-select") && + $(mySelect).parents(".multiselect-native-select").length < 1) { + if (!$(mySelect).attr("multiple")) { + if ($(mySelect).attr("enableFilter")) { + $(mySelect).multiselect({ + numberDisplayed: 1, + maxHeight: 200 + }); + } else { + $(mySelect).multiselect({ + numberDisplayed: 1, + enableFiltering: true, + maxHeight: 200 + }); + } + + } else { + $(mySelect).multiselect({ + numberDisplayed: 1, + includeSelectAllOption: true, + enableFiltering: true, + maxHeight: 200, + enableCaseInsensitiveFiltering: true + }); + } + + } else if ($(mySelect).parents(".multiselect-native-select") && + $(mySelect).parents(".multiselect-native-select").length > 0) { + var selectDrop = $(mySelect).parent(".multiselect-native-select").find("select"); + $(mySelect).parent(".multiselect-native-select").parent().html(selectDrop); + if (!$(mySelect).attr("multiple")) { + if ($(mySelect).attr("enableFilter")) { + $(mySelect).multiselect({ + numberDisplayed: 1, + maxHeight: 200 + }); + } else { + $(mySelect).multiselect({ + numberDisplayed: 1, + enableFiltering: true, + maxHeight: 200 + }); + } + } else { + $(mySelect).multiselect({ + numberDisplayed: 1, + includeSelectAllOption: true, + enableFiltering: true, + maxHeight: 200, + enableCaseInsensitiveFiltering: true + }); + } + } + }); + //refeshMultiSelect(); } function loadSharedPropertyByService(onChangeUUID, refresh, callBack) { |