diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-10 16:51:47 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-10 16:51:47 +0300 |
commit | e4e8e0fc9df9dbd1cc6582ef9932a346e1c376a0 (patch) | |
tree | 88d27ab6dbcfd16034b06c4e18418bf839eb0420 /app/assets/javascripts/main.js | |
parent | 1fb4215beaa214f22ee59ebf7182a1696ad6baa5 (diff) | |
parent | b40bac3a3c251110ddba3f90d6d1e4419a65afe3 (diff) |
Merge branch 'flash-es6-module' into 'master'
Flash is now a ES6 module
See merge request gitlab-org/gitlab-ce!14626
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r-- | app/assets/javascripts/main.js | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index ac7b976f811..abb238abbc3 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -1,5 +1,4 @@ /* eslint-disable func-names, space-before-function-paren, no-var, quotes, consistent-return, prefer-arrow-callback, comma-dangle, object-shorthand, no-new, max-len, no-multi-spaces, import/newline-after-import, import/first */ -/* global Flash */ /* global ConfirmDangerModal */ /* global Aside */ @@ -71,7 +70,7 @@ import './diff'; import './dropzone_input'; import './due_date_select'; import './files_comment_button'; -import './flash'; +import Flash from './flash'; import './gl_dropdown'; import './gl_field_error'; import './gl_field_errors'; @@ -164,7 +163,6 @@ $(function () { var $document = $(document); var $window = $(window); var $sidebarGutterToggle = $('.js-sidebar-toggle'); - var $flash = $('.flash-container'); var bootstrapBreakpoint = bp.getBreakpointSize(); var fitSidebarForSize; @@ -249,13 +247,6 @@ $(function () { // Form submitter }); gl.utils.localTimeAgo($('abbr.timeago, .js-timeago'), true); - // Flash - if ($flash.length > 0) { - $flash.click(function () { - return $(this).fadeOut(); - }); - $flash.show(); - } // Disable form buttons while a form is submitting $body.on('ajax:complete, ajax:beforeSend, submit', 'form', function (e) { var buttons; |