summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-07-13 17:10:31 +0100
committerPhil Hughes <me@iamphill.com>2017-07-13 17:10:31 +0100
commit8d6fae2c030ed3cfe5721e1d8a878c0693e90f97 (patch)
tree5bae01e38becbd86f52fcd64b96ba1ea836589e5 /app/assets/javascripts
parent48b976e0973066ebf2f2ffd01b1bb4a7e9d4d040 (diff)
downloadgitlab-ce-user-inline-scripts.tar.gz
Removed user profile inline JavaScriptuser-inline-scripts
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/dispatcher.js3
-rw-r--r--app/assets/javascripts/user_tabs.js7
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index ae19592ecbe..b903f0f983b 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -409,6 +409,9 @@ import PerformanceBar from './performance_bar';
break;
case 'users:show':
new UserCallout();
+ new gl.User({
+ action: document.querySelector('.js-user-profile').dataset.action,
+ });
break;
case 'admin:conversational_development_index:show':
new UserCallout();
diff --git a/app/assets/javascripts/user_tabs.js b/app/assets/javascripts/user_tabs.js
index f8e23c8624d..a5ff9b1526e 100644
--- a/app/assets/javascripts/user_tabs.js
+++ b/app/assets/javascripts/user_tabs.js
@@ -1,4 +1,5 @@
/* eslint-disable max-len, space-before-function-paren, no-underscore-dangle, consistent-return, comma-dangle, no-unused-vars, dot-notation, no-new, no-return-assign, camelcase, no-param-reassign, class-methods-use-this */
+/* global Calendar */
/*
UserTabs
@@ -147,7 +148,11 @@ export default class UserTabs {
return;
}
const $calendarWrap = this.$parentEl.find('.user-calendar');
- $calendarWrap.load($calendarWrap.data('href'));
+ $calendarWrap.load($calendarWrap.data('href'), () => {
+ const calendarEl = document.querySelector('.calendar');
+
+ return new Calendar(JSON.parse(calendarEl.dataset.dates), calendarEl.dataset.path);
+ });
new gl.Activities();
return this.loaded['activity'] = true;
}