Commit 361a7430 authored by bbaer's avatar bbaer
Browse files

Should only show reload button and be modal when the conflict is mandatory.

parent d98e542b
......@@ -261,7 +261,8 @@ var QfqNS = QfqNS || {};
buttons: messageButtons
message.on('alert.reload', function () {
  • Commit message refers to previous commit (which has a completely wrong commit message)

Please register or sign in to reply
  • What's the purpose of $(window).unload();? What's the difference between $(window).location.reload() and window.location.reload() (except for the obvious "one is jquery the other native JS")?

  • According to the internet there is sometimes different behaviour, just wanted to try it. I guess like everything from jQuery, they try to keep the behaviour of the function constant across different browsers and js implementations.

Supports Markdown
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