diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-28 22:59:29 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-28 22:59:29 +0300 |
| commit | 593b6674e1b3fb1d5277b823703b9bbc366152b2 (patch) | |
| tree | 4b9283fea464a917366a512e90560f3ad261b728 | |
| parent | 67d5b95dd28a71ba213ef6815b08117db807dea3 (diff) | |
| parent | b72ce57da60c337c38cf450e52fb93b8792d9cd5 (diff) | |
| download | gitlab-ce-593b6674e1b3fb1d5277b823703b9bbc366152b2.tar.gz | |
Merge branch 'federkasten/gitlab-ce-fix-high-cpu-in-ff'
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/markdown_area.js.coffee | 19 |
2 files changed, 16 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5c5253cf04b..e064537cac6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ v 7.2.0 - Explore page - Add project stars (Ciro Santilli) - Log Sidekiq arguments + - Fix cpu usage issue in Firefox v 7.1.0 - Remove observers diff --git a/app/assets/javascripts/markdown_area.js.coffee b/app/assets/javascripts/markdown_area.js.coffee index 1449735fae9..bee2785562d 100644 --- a/app/assets/javascripts/markdown_area.js.coffee +++ b/app/assets/javascripts/markdown_area.js.coffee @@ -20,6 +20,9 @@ $(document).ready -> $(".div-dropzone-hover").append iconPicture $(".div-dropzone").append divSpinner $(".div-dropzone-spinner").append iconSpinner + $(".div-dropzone-spinner").css + "opacity": 0 + "display": "none" dropzone = $(".div-dropzone").dropzone( url: project_image_path_upload @@ -66,13 +69,17 @@ $(document).ready -> return sending: -> - $(".div-dropzone-spinner").css "opacity", 0.7 + $(".div-dropzone-spinner").css + "opacity": 0.7 + "display": "inherit" return complete: -> $(".dz-preview").remove() $(".markdown-area").trigger "input" - $(".div-dropzone-spinner").css "opacity", 0 + $(".div-dropzone-spinner").css + "opacity": 0 + "display": "none" return ) @@ -163,10 +170,14 @@ $(document).ready -> val + url + "\n" showSpinner = (e) -> - $(".div-dropzone-spinner").css "opacity", 0.7 + $(".div-dropzone-spinner").css + "opacity": 0.7 + "display": "inherit" closeSpinner = -> - $(".div-dropzone-spinner").css "opacity", 0 + $(".div-dropzone-spinner").css + "opacity": 0 + "display": "none" showError = (message) -> checkIfMsgExists = $(".error-alert").children().length |