moved some more inline code

removed some global variable comments
This commit is contained in:
Phil Hughes 2017-07-25 16:46:15 +01:00
parent fe27de8bf1
commit 887227e037
6 changed files with 20 additions and 15 deletions

View file

@ -27,9 +27,6 @@
/* global Shortcuts */
/* global Sidebar */
/* global ShortcutsWiki */
/* global IssuableContext */
/* global IssueStatusSelect */
/* global SubscriptionSelect */
import Issue from './issue';
import BindInOut from './behaviors/bind_in_out';

View file

@ -5,11 +5,13 @@
/* global Sidebar */
export default () => {
const sidebarOptions = JSON.parse(document.querySelector('.js-sidebar-options').innerHTML);
new MilestoneSelect({
full_path: gl.sidebarOptions.fullPath,
full_path: sidebarOptions.fullPath,
});
new LabelsSelect();
new IssuableContext(gl.sidebarOptions.currentUser);
new IssuableContext(sidebarOptions.currentUser);
gl.Subscription.bindAll('.subscription');
new gl.DueDateSelectors();
window.sidebar = new Sidebar();

View file

@ -4,6 +4,8 @@
import Cookies from 'js-cookie';
import UsersSelect from './users_select';
const PARTICIPANTS_ROW_COUNT = 7;
(function() {
this.IssuableContext = (function() {
function IssuableContext(currentUser) {
@ -52,7 +54,7 @@ import UsersSelect from './users_select';
IssuableContext.prototype.initParticipants = function() {
$(document).on("click", ".js-participants-more", this.toggleHiddenParticipants);
return $(".js-participants-author").each(function(i) {
if (i >= 7) {
if (i >= PARTICIPANTS_ROW_COUNT) {
return $(this).addClass("js-participants-hidden").hide();
}
});

View file

@ -5,7 +5,8 @@ import sidebarAssignees from './components/assignees/sidebar_assignees';
import Mediator from './sidebar_mediator';
function domContentLoaded() {
const mediator = new Mediator(gl.sidebarOptions);
const sidebarOptions = JSON.parse(document.querySelector('.js-sidebar-options').innerHTML);
const mediator = new Mediator(sidebarOptions);
mediator.fetch();
const sidebarAssigneesEl = document.querySelector('#js-vue-sidebar-assignees');

View file

@ -354,4 +354,14 @@ module IssuablesHelper
params[:format] = :json if issuable.is_a?(Issue)
end
end
def issuable_sidebar_options(issuable, can_edit_issuable)
{
endpoint: "#{issuable_json_path(issuable)}?basic=true",
editable: can_edit_issuable,
currentUser: current_user.as_json(only: [:username, :id, :name], methods: :avatar_url),
rootPath: root_path,
fullPath: @project.full_path
}
end
end

View file

@ -138,11 +138,4 @@
= project_ref
= clipboard_button(text: project_ref, title: "Copy reference to clipboard", placement: "left")
:javascript
gl.sidebarOptions = {
endpoint: "#{issuable_json_path(issuable)}?basic=true",
editable: #{can_edit_issuable ? true : false},
currentUser: #{current_user.to_json(only: [:username, :id, :name], methods: :avatar_url)},
rootPath: "#{root_path}",
fullPath: "#{@project.full_path}",
};
%script.js-sidebar-options{ type: "application/json" }= issuable_sidebar_options(issuable, can_edit_issuable).to_json.html_safe