[Rt-commit] rt branch, 4.6/selectize-multiple-user-inputs, repushed

? sunnavy sunnavy at bestpractical.com
Fri Dec 6 16:24:21 EST 2019


The branch 4.6/selectize-multiple-user-inputs was deleted and repushed:
       was 180efa611037d9c329c156f8292bf14c05a05be8
       now 1f220fec32a49bf31811c516246bedae2eb0558f

 1: 23f81caae9 < --:  ------- Add sortable component to jQuery UI, which is needed for Selectize
 2: 3428fd96b4 !  1: 0c82ad31c9 Add Selectize js lib to RT
    @@ -6,9 +6,10 @@
     --- a/devel/third-party/README
     +++ b/devel/third-party/README
     @@
    - Origin: https://github.com/ccampbell/mousetrap
    - License: Apache
    - 
    + Description: A set of SVG icons. Icon files are installed via npm, then webpack tree-shakes to generate js for only the icons we use.
    + Origin: https://github.com/FortAwesome/Font-Awesome/tree/master/js-packages/%40fortawesome
    + License: Icons: CC BY 4.0, Code: MIT License
    ++
     +* selectize-0.12.6
     +Description: bubble-like multiple user inputs
     +Origin: https://selectize.github.io/selectize.js/
    @@ -4325,27 +4326,30 @@
     --- a/lib/RT/Interface/Web.pm
     +++ b/lib/RT/Interface/Web.pm
     @@
    -       jquery.modal.min.js
    -       jquery.modal-defaults.js
    -       jquery.cookie.js
    -+      selectize.min.js
    -       titlebox-state.js
    -       i18n.js
    -       util.js
    +         jquery-ui-timepicker-addon.js
    +         jquery-ui-patch-datepicker.js
    +         jquery.cookie.js
    ++        selectize.min.js
    +         popper.min.js
    +         bootstrap.min.js
    +         bootstrap-select.min.js
     
    -diff --git a/share/static/css/base/main.css b/share/static/css/base/main.css
    ---- a/share/static/css/base/main.css
    -+++ b/share/static/css/base/main.css
    +diff --git a/share/static/css/elevator-light/main.css b/share/static/css/elevator-light/main.css
    +--- a/share/static/css/elevator-light/main.css
    ++++ b/share/static/css/elevator-light/main.css
     @@
    + @import "bootstrap-combobox.css";
    + @import "dropzone.css";
      @import "dropzone.customized.css";
    - @import "keyboard-shortcuts.css";
    - @import "shredder.css";
     + at import "selectize.default.css";
    + 
    + @import "base.css";
    + @import "collection.css";
     
    -diff --git a/share/static/css/base/selectize.default.css b/share/static/css/base/selectize.default.css
    +diff --git a/share/static/css/elevator-light/selectize.default.css b/share/static/css/elevator-light/selectize.default.css
     new file mode 100644
     --- /dev/null
    -+++ b/share/static/css/base/selectize.default.css
    ++++ b/share/static/css/elevator-light/selectize.default.css
     @@
     +/**
     + * selectize.default.css (v0.12.6) - Default Theme
--:  ------- >  2: 76d2e5ec61 Add sortable component to jQuery UI, which is needed for our selectize UI
 3: 2224687797 =  3: 0290b678f9 Add css to Theme.html for multiple user input bubbles
 4: 2488057a8c !  4: 397aceed07 Switch to Selectize for multiple user inputs
    @@ -6,40 +6,33 @@
         also enhanced it so people can easily move those emails from an input to
         another via drag/drop.
     
    -diff --git a/share/html/Ticket/Elements/UpdateCc b/share/html/Ticket/Elements/UpdateCc
    ---- a/share/html/Ticket/Elements/UpdateCc
    -+++ b/share/html/Ticket/Elements/UpdateCc
    +diff --git a/share/html/Elements/EmailInput b/share/html/Elements/EmailInput
    +--- a/share/html/Elements/EmailInput
    ++++ b/share/html/Elements/EmailInput
     @@
    +     type="text"
    +     id="<% $Name %>"
    +     name="<% $Name %>"
    +-    class="form-control"
    ++    class="<% $AutocompleteMultiple ? '' : 'form-control' %>"
    +     value="<% $Default || '' %>"
      
    - <tr><td class="label"><&|/l&>One-time Cc</&>:</td><td><& /Elements/EmailInput, Name => 'UpdateCc', Size => undef, Default => $ARGS{UpdateCc}, AutocompleteMultiple => 1 &>
    - <input type="hidden" id="UpdateIgnoreAddressCheckboxes" name="UpdateIgnoreAddressCheckboxes" value="0">
    --        <br />
    - 
    - %if (scalar @one_time_Ccs) {
    - %   if ($hide_cc_suggestions) {
    + % if (defined $Size) {
    +
    +diff --git a/share/static/css/elevator-light/main.css b/share/static/css/elevator-light/main.css
    +--- a/share/static/css/elevator-light/main.css
    ++++ b/share/static/css/elevator-light/main.css
     @@
    - </div>
    - %}
    - </td></tr>
    --<tr><td class="label"><&|/l&>One-time Bcc</&>:</td><td><& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc}, AutocompleteMultiple => 1 &><br />
    -+<tr><td class="label"><&|/l&>One-time Bcc</&>:</td><td><& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc}, AutocompleteMultiple => 1 &>
    - %if (scalar @one_time_Ccs) {
    - %   if ($hide_cc_suggestions) {
    -         <a href="#" class="ToggleSuggestions" data-hide-label="<% $hide_label %>" data-show-label="<% $show_label %>">
    + @import "dashboards.css";
    + @import "ticket-lists.css";
    + @import "ticket-search.css";
    ++ at import "selectize.customized.css";
    + @import "print.css";
     
    -diff --git a/share/static/css/base/main.css b/share/static/css/base/main.css
    ---- a/share/static/css/base/main.css
    -+++ b/share/static/css/base/main.css
    -@@
    - @import "keyboard-shortcuts.css";
    - @import "shredder.css";
    - @import "selectize.default.css";
    -+ at import "selectize.customized.css";
    -
    -diff --git a/share/static/css/base/selectize.customized.css b/share/static/css/base/selectize.customized.css
    +diff --git a/share/static/css/elevator-light/selectize.customized.css b/share/static/css/elevator-light/selectize.customized.css
     new file mode 100644
     --- /dev/null
    -+++ b/share/static/css/base/selectize.customized.css
    ++++ b/share/static/css/elevator-light/selectize.customized.css
     @@
     +.selectize-control.plugin-remove_button [data-value] .remove {
     +  border-left: none;
 5: 32282bb99a !  5: f38175b0ae Show labels instead of values(emails) for default values too
    @@ -39,7 +39,7 @@
     +        );
     +        if ($json) {
     +            if ( my $parsed = JSON::from_json($json) ) {
    -+                push @options, $parsed->[0];
    ++                push @options, $parsed->[0] || ();
     +            }
     +        }
     +    }
    @@ -81,25 +81,23 @@
     --- a/share/html/Ticket/Elements/UpdateCc
     +++ b/share/html/Ticket/Elements/UpdateCc
     @@
    - %# END BPS TAGGED BLOCK }}}
    - % $m->callback(CallbackName => 'BeforeCc', ARGSRef => \%ARGS, Ticket => $TicketObj, one_time_Ccs => \@one_time_Ccs, txn_addresses => \%txn_addresses);
    +     <&|/l&>One-time Cc</&>:
    +   </div>
    +   <div class="col-md-9 value">
    +-    <& /Elements/EmailInput, Name => 'UpdateCc', Size => undef, Default => $ARGS{UpdateCc}, AutocompleteMultiple => 1 &>
    ++    <& /Elements/EmailInput, Name => 'UpdateCc', Size => undef, Default => $ARGS{UpdateCc}, AutocompleteMultiple => 1, Options => \@one_time_Ccs &>
    +     <input type="hidden" id="UpdateIgnoreAddressCheckboxes" name="UpdateIgnoreAddressCheckboxes" value="0">
    +   </div>
    + </div>
    +@@
    +     <&|/l&>One-time Bcc</&>:
    +   </div>
    +   <div class="col-md-9 value">
    +-    <& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc}, AutocompleteMultiple => 1 &>
    ++    <& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc}, AutocompleteMultiple => 1, Options => \@one_time_Ccs &>
    +   </div>
    + </div>
      
    --<tr><td class="label"><&|/l&>One-time Cc</&>:</td><td><& /Elements/EmailInput, Name => 'UpdateCc', Size => undef, Default => $ARGS{UpdateCc}, AutocompleteMultiple => 1 &>
    -+<tr><td class="label"><&|/l&>One-time Cc</&>:</td>
    -+    <td><& /Elements/EmailInput, Name => 'UpdateCc', Size => undef, Default => $ARGS{UpdateCc}, AutocompleteMultiple => 1, Options => \@one_time_Ccs &>
    - <input type="hidden" id="UpdateIgnoreAddressCheckboxes" name="UpdateIgnoreAddressCheckboxes" value="0">
    - 
    - %if (scalar @one_time_Ccs) {
    -@@
    - </div>
    - %}
    - </td></tr>
    --<tr><td class="label"><&|/l&>One-time Bcc</&>:</td><td><& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc}, AutocompleteMultiple => 1 &>
    -+<tr><td class="label"><&|/l&>One-time Bcc</&>:</td>
    -+    <td><& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc}, AutocompleteMultiple => 1, Options => \@one_time_Ccs &>
    - %if (scalar @one_time_Ccs) {
    - %   if ($hide_cc_suggestions) {
    -         <a href="#" class="ToggleSuggestions" data-hide-label="<% $hide_label %>" data-show-label="<% $show_label %>">
     
     diff --git a/share/static/js/autocomplete.js b/share/static/js/autocomplete.js
     --- a/share/static/js/autocomplete.js
 6: 974b288a42 < --:  ------- Disable browser autocomplete for selectize related inputs
--:  ------- >  6: e8642f1eba Disable browser autocomplete for selectize related inputs
 7: 29c47233ed =  7: b539d0aa4f Support selectize_option/selectize_item from json to customize option/item UI
 8: 166b5f82b6 =  8: c2f250d55c Make values of fields specified in $UserSearchFields searchable in selectize
 9: dd79b9f5b5 !  9: f52f40b43b Remove the hardcoded max-height limit for selectize dropdown
    @@ -5,9 +5,9 @@
         As people could customize the option UI in the dropdown, it's possible
         that 200px is not big enough.
     
    -diff --git a/share/static/css/base/selectize.customized.css b/share/static/css/base/selectize.customized.css
    ---- a/share/static/css/base/selectize.customized.css
    -+++ b/share/static/css/base/selectize.customized.css
    +diff --git a/share/static/css/elevator-light/selectize.customized.css b/share/static/css/elevator-light/selectize.customized.css
    +--- a/share/static/css/elevator-light/selectize.customized.css
    ++++ b/share/static/css/elevator-light/selectize.customized.css
     @@
        background-image: linear-gradient(to bottom, #284691, #284691);
        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff284691', endColorstr='#ff284691', GradientType=0);
10: 180efa6110 ! 10: d61ed4bbce Don't set content type for internal users autocomplete calls
    @@ -25,3 +25,4 @@
      <% JSON( \@suggestions ) |n %>
      % $m->abort if $abort;
      <%ARGS>
    +
--:  ------- > 11: 7654b4d245 Add padding for the user inputs in the selectize dropdown
--:  ------- > 12: 1f220fec32 Use hovered-menu bg color for hovered selectize dropdown item too



More information about the rt-commit mailing list