Loading image added. #59
Conversation
| crossorigin="anonymous"></script> | ||
| <script type="text/javascript"> | ||
| var ts = new Date().valueOf() // cache breaker | ||
| document.write('<script src="./main.js?t=' + ts + '"><\/script>') | ||
| </script> | ||
| <script language="javascript" type="text/javascript"> | ||
| $(window).load(function() { | ||
| $('#loading').hide(); |
There was a problem hiding this comment.
I'm not sure what this is doing, but it should be hooked in to the SessionStores 'data' event (see main.js, ca. line 257) - i.e. loader should display until the session data was loaded via ajax.
|
Can we please use a simpler icon, e.g. a black circle ball via http://www.ajaxload.info/? |
|
@SilentFlame This is a nice thing to have, but we also have some basic features, we need. Would be great, if you could help with this one: #28 |
|
@SilentFlame There are merge conflicts with this PR. Also as a general tip, always add a preview link (viz. |
|
@jig08 are merge conflicts arise when we make a pull request from a branch which is non-existing on the main repo, or is it something else? |
|
It's because we pushed conflicting changes to |
|
I have rebase my develop branch with the gh-pages on my local system then pushed the local gh-pages to the forked repo. now should it work? |
|
@SilentFlame It does have. |
|
@jig08 unable to resolve can you help please? |
|
Go through the simple steps in this guide, it might help. |
|
@SilentFlame did you pull the upstream |
resolves #26
@joerx have a look, if that's what is needed,
you close the Issue and merge the PR.