Commit adce7bbf authored by Clement Ho's avatar Clement Ho

Automatically close user dropdown for CE (EE conflict)

parent e4003ebd
...@@ -421,6 +421,17 @@ window.emitSidebarEvent = window.emitSidebarEvent || $.noop; ...@@ -421,6 +421,17 @@ window.emitSidebarEvent = window.emitSidebarEvent || $.noop;
selected = $dropdown.closest('.selectbox').find("input[name='" + ($dropdown.data('field-name')) + "']").val(); selected = $dropdown.closest('.selectbox').find("input[name='" + ($dropdown.data('field-name')) + "']").val();
return assignTo(selected); return assignTo(selected);
} }
// Automatically close dropdown after assignee is selected
// since CE has no multiple assignees
// EE does not have a max-select
if ($dropdown.data('max-select') &&
getSelected().length === $dropdown.data('max-select')) {
// Close the dropdown
$dropdown.dropdown('toggle');
this.hidden();
}
}, },
id: function (user) { id: function (user) {
return user.id; return user.id;
......
* {
-o-transition: none !important;
-moz-transition: none !important;
-ms-transition: none !important;
-webkit-transition: none !important;
transition: none !important;
-o-transform: none !important;
-moz-transform: none !important;
-ms-transform: none !important;
-webkit-transform: none !important;
transform: none !important;
-webkit-animation: none !important;
-moz-animation: none !important;
-o-animation: none !important;
-ms-animation: none !important;
animation: none !important;
}
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
= stylesheet_link_tag "application", media: "all" = stylesheet_link_tag "application", media: "all"
= stylesheet_link_tag "print", media: "print" = stylesheet_link_tag "print", media: "print"
= stylesheet_link_tag "test", media: "all" if Rails.env.test?
= Gon::Base.render_data = Gon::Base.render_data
...@@ -34,6 +35,7 @@ ...@@ -34,6 +35,7 @@
= webpack_bundle_tag "common" = webpack_bundle_tag "common"
= webpack_bundle_tag "main" = webpack_bundle_tag "main"
= webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled = webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled
= webpack_bundle_tag "test" if Rails.env.test?
- if content_for?(:page_specific_javascripts) - if content_for?(:page_specific_javascripts)
= yield :page_specific_javascripts = yield :page_specific_javascripts
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
- options[:data][:multi_select] = true - options[:data][:multi_select] = true
- options[:data]['dropdown-title'] = title - options[:data]['dropdown-title'] = title
- options[:data]['dropdown-header'] = 'Assignee' - options[:data]['dropdown-header'] = 'Assignee'
- options[:data]['max-select'] = 1
- else - else
- title = 'Select assignee' - title = 'Select assignee'
......
...@@ -111,6 +111,7 @@ module Gitlab ...@@ -111,6 +111,7 @@ module Gitlab
config.assets.precompile << "xterm/xterm.css" config.assets.precompile << "xterm/xterm.css"
config.assets.precompile << "lib/ace.js" config.assets.precompile << "lib/ace.js"
config.assets.precompile << "vendor/assets/fonts/*" config.assets.precompile << "vendor/assets/fonts/*"
config.assets.precompile << "test.css"
# Version of your assets, change this if you want to expire all your assets # Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0' config.assets.version = '1.0'
......
...@@ -65,6 +65,7 @@ var config = { ...@@ -65,6 +65,7 @@ var config = {
users: './users/users_bundle.js', users: './users/users_bundle.js',
raven: './raven/index.js', raven: './raven/index.js',
vue_merge_request_widget: './vue_merge_request_widget/index.js', vue_merge_request_widget: './vue_merge_request_widget/index.js',
test: './test.js',
}, },
output: { output: {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment