Commit b72ce57d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce...

Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce into federkasten/gitlab-ce-fix-high-cpu-in-ff
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
parents 67d5b95d 10572511
...@@ -2,6 +2,7 @@ v 7.2.0 ...@@ -2,6 +2,7 @@ v 7.2.0
- Explore page - Explore page
- Add project stars (Ciro Santilli) - Add project stars (Ciro Santilli)
- Log Sidekiq arguments - Log Sidekiq arguments
- Fix cpu usage issue in Firefox
v 7.1.0 v 7.1.0
- Remove observers - Remove observers
......
...@@ -20,6 +20,9 @@ $(document).ready -> ...@@ -20,6 +20,9 @@ $(document).ready ->
$(".div-dropzone-hover").append iconPicture $(".div-dropzone-hover").append iconPicture
$(".div-dropzone").append divSpinner $(".div-dropzone").append divSpinner
$(".div-dropzone-spinner").append iconSpinner $(".div-dropzone-spinner").append iconSpinner
$(".div-dropzone-spinner").css
"opacity": 0
"display": "none"
dropzone = $(".div-dropzone").dropzone( dropzone = $(".div-dropzone").dropzone(
url: project_image_path_upload url: project_image_path_upload
...@@ -66,13 +69,17 @@ $(document).ready -> ...@@ -66,13 +69,17 @@ $(document).ready ->
return return
sending: -> sending: ->
$(".div-dropzone-spinner").css "opacity", 0.7 $(".div-dropzone-spinner").css
"opacity": 0.7
"display": "inherit"
return return
complete: -> complete: ->
$(".dz-preview").remove() $(".dz-preview").remove()
$(".markdown-area").trigger "input" $(".markdown-area").trigger "input"
$(".div-dropzone-spinner").css "opacity", 0 $(".div-dropzone-spinner").css
"opacity": 0
"display": "none"
return return
) )
...@@ -163,10 +170,14 @@ $(document).ready -> ...@@ -163,10 +170,14 @@ $(document).ready ->
val + url + "\n" val + url + "\n"
showSpinner = (e) -> showSpinner = (e) ->
$(".div-dropzone-spinner").css "opacity", 0.7 $(".div-dropzone-spinner").css
"opacity": 0.7
"display": "inherit"
closeSpinner = -> closeSpinner = ->
$(".div-dropzone-spinner").css "opacity", 0 $(".div-dropzone-spinner").css
"opacity": 0
"display": "none"
showError = (message) -> showError = (message) ->
checkIfMsgExists = $(".error-alert").children().length checkIfMsgExists = $(".error-alert").children().length
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment