Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #168

Merged
merged 3 commits into from
Apr 28, 2017
Merged

Dev #168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb0df79
fixed bug with spinner not showing up
uplink42 Apr 25, 2017
378e472
Removed pace loader from ajax requests. Added user email to mail body
uplink42 Apr 28, 2017
a11984f
fixed bug in broker fee calculation
uplink42 Apr 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fixed bug with spinner not showing up
  • Loading branch information
@uplink42
uplink42 committed Apr 25, 2017
commit eb0df79ececf88b16d5f38284f7402f0fe64303f
2 changes: 1 addition & 1 deletion application/models/Updater_model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ public function setNewInfo() : void
* @param string|null $user username
* @return array result list, only for non global update
*/
public function updateTotals(string $user = null, bool $global = false)
public function updateTotals(string $username = null, bool $global = false)
{
$this->db->select('name, character_eve_idcharacter');
$this->db->where('username', $username);
Expand Down
4 changes: 3 additions & 1 deletion assets/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,15 @@ $(document).ready(function() {
var shouldLoad = true;
didLoad = false;
$(document).bind("ajaxStart.go", function () {
shouldLoad = true;
setTimeout(function() {
if (shouldLoad) {
console.log('spinner started');
didLoad = true;
$(".mainwrapper").addClass('loading-body');
$('.panel-loading-ajax').show();
}
},200);
},250);
});

$(document).bind("ajaxStop.go", function () {
Expand Down