diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-19 12:59:23 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-19 12:59:23 +0200 |
| commit | c1fd25ce6ed28ad19fe4928be018a189c06cc3d7 (patch) | |
| tree | 3c1562c54ec84436bd3d86c18788464ce11ab936 /app/assets | |
| parent | 046773d6e53035599544de4f85906bf706eab7d1 (diff) | |
| download | gitlab-ce-c1fd25ce6ed28ad19fe4928be018a189c06cc3d7.tar.gz | |
Replace turbolink spinner with nprogress
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/application.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/main.js.coffee | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 4a393dbfe81..f69b750bb69 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -29,3 +29,5 @@ //= require_tree . //= require d3 //= require underscore +//= require nprogress +//= require nprogress-turbolinks diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index 70e8972d24d..89f6a547ff8 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -41,19 +41,11 @@ window.linkify = (str) -> window.simpleFormat = (str) -> linkify(sanitize(str).replace(/\n/g, '<br />')) -window.startSpinner = -> - $('.turbolink-spinner').fadeIn() - -window.stopSpinner = -> - $('.turbolink-spinner').fadeOut() - window.unbindEvents = -> $(document).unbind('scroll') $(document).off('scroll') -document.addEventListener("page:fetch", startSpinner) document.addEventListener("page:fetch", unbindEvents) -document.addEventListener("page:change", stopSpinner) $ -> # Click a .one_click_select field, select the contents diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 33466714681..4b7103010bb 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -7,6 +7,8 @@ *= require select2 *= require highlightjs.min *= require_self + *= require nprogress + *= require nprogress-bootstrap */ @import "main/variables.scss"; |