Commit f59a44db authored by Clement Ho's avatar Clement Ho

Merge branch 'fix-main-bundle-sans-vue' into 'master'

Prevent vue.esm.js from being bundled into the primary JS bundle

Closes #31966

See merge request !11177
parents 503e8a9f b095c407
import Vue from 'vue'; import Vue from 'vue';
export default new Vue(); const eventHub = new Vue();
// TODO: remove eventHub hack after code splitting refactor
window.emitSidebarEvent = (...args) => eventHub.$emit(...args);
export default eventHub;
/* eslint-disable func-names, space-before-function-paren, one-var, no-var, prefer-rest-params, wrap-iife, quotes, max-len, one-var-declaration-per-line, vars-on-top, prefer-arrow-callback, consistent-return, comma-dangle, object-shorthand, no-shadow, no-unused-vars, no-else-return, no-self-compare, prefer-template, no-unused-expressions, no-lonely-if, yoda, prefer-spread, no-void, camelcase, no-param-reassign */ /* eslint-disable func-names, space-before-function-paren, one-var, no-var, prefer-rest-params, wrap-iife, quotes, max-len, one-var-declaration-per-line, vars-on-top, prefer-arrow-callback, consistent-return, comma-dangle, object-shorthand, no-shadow, no-unused-vars, no-else-return, no-self-compare, prefer-template, no-unused-expressions, no-lonely-if, yoda, prefer-spread, no-void, camelcase, no-param-reassign */
/* global Issuable */ /* global Issuable */
/* global emitSidebarEvent */
import eventHub from './sidebar/event_hub'; // TODO: remove eventHub hack after code splitting refactor
window.emitSidebarEvent = window.emitSidebarEvent || $.noop;
(function() { (function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; }, var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; },
...@@ -110,7 +112,7 @@ import eventHub from './sidebar/event_hub'; ...@@ -110,7 +112,7 @@ import eventHub from './sidebar/event_hub';
.find(`input[name='${$dropdown.data('field-name')}'][value=${firstSelectedId}]`); .find(`input[name='${$dropdown.data('field-name')}'][value=${firstSelectedId}]`);
firstSelected.remove(); firstSelected.remove();
eventHub.$emit('sidebar.removeAssignee', { emitSidebarEvent('sidebar.removeAssignee', {
id: firstSelectedId, id: firstSelectedId,
}); });
} }
...@@ -330,7 +332,7 @@ import eventHub from './sidebar/event_hub'; ...@@ -330,7 +332,7 @@ import eventHub from './sidebar/event_hub';
defaultLabel: defaultLabel, defaultLabel: defaultLabel,
hidden: function(e) { hidden: function(e) {
if ($dropdown.hasClass('js-multiselect')) { if ($dropdown.hasClass('js-multiselect')) {
eventHub.$emit('sidebar.saveAssignees'); emitSidebarEvent('sidebar.saveAssignees');
} }
if (!$dropdown.data('always-show-selectbox')) { if (!$dropdown.data('always-show-selectbox')) {
...@@ -364,10 +366,10 @@ import eventHub from './sidebar/event_hub'; ...@@ -364,10 +366,10 @@ import eventHub from './sidebar/event_hub';
const id = parseInt(element.value, 10); const id = parseInt(element.value, 10);
element.remove(); element.remove();
}); });
eventHub.$emit('sidebar.removeAllAssignees'); emitSidebarEvent('sidebar.removeAllAssignees');
} else if (isActive) { } else if (isActive) {
// user selected // user selected
eventHub.$emit('sidebar.addAssignee', user); emitSidebarEvent('sidebar.addAssignee', user);
// Remove unassigned selection (if it was previously selected) // Remove unassigned selection (if it was previously selected)
const unassignedSelected = $dropdown.closest('.selectbox') const unassignedSelected = $dropdown.closest('.selectbox')
...@@ -383,7 +385,7 @@ import eventHub from './sidebar/event_hub'; ...@@ -383,7 +385,7 @@ import eventHub from './sidebar/event_hub';
} }
// User unselected // User unselected
eventHub.$emit('sidebar.removeAssignee', user); emitSidebarEvent('sidebar.removeAssignee', user);
} }
if (getSelected().find(u => u === gon.current_user_id)) { if (getSelected().find(u => u === gon.current_user_id)) {
......
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