Skip to content

Commit

Permalink
fix(js): switch to elgg spinner and require jquery form
Browse files Browse the repository at this point in the history
  • Loading branch information
hypeJunction committed Feb 5, 2016
1 parent 76b9cbf commit 077b017
Showing 1 changed file with 9 additions and 15 deletions.
24 changes: 9 additions & 15 deletions views/default/framework/inbox/user.js
Expand Up @@ -2,7 +2,9 @@ define(function (require) {

var elgg = require('elgg');
var $ = require('jquery');

var spinner = require('elgg/spinner');
require('jquery.form');

var inbox = {
/**
* Bind events
Expand Down Expand Up @@ -60,12 +62,8 @@ define(function (require) {
var $elem = $(this);

elgg.action($elem.attr('href'), {
beforeSend: function () {
$('body').addClass('elgg-state-loading');
},
complete: function () {
$('body').removeClass('elgg-state-loading');
},
beforeSend: spinner.start,
complete: spinner.stop,
success: function (data) {
var $msg = $elem.closest('.inbox-message');
$msg.addClass('inbox-message-read').removeClass('inbox-message-unread');
Expand All @@ -84,12 +82,8 @@ define(function (require) {
var $elem = $(this);

elgg.action($elem.attr('href'), {
beforeSend: function () {
$('body').addClass('elgg-state-loading');
},
complete: function () {
$('body').removeClass('elgg-state-loading');
},
beforeSend: spinner.start,
complete: spinner.stop,
success: function (data) {
var $msg = $elem.closest('.inbox-message');
$elem.closest('.inbox-message').addClass('inbox-message-unread').removeClass('inbox-message-read');
Expand All @@ -104,11 +98,11 @@ define(function (require) {
data: $form.serialize(),
beforeSend: function () {
$form.find('[type="submit"]').prop('disabled', true).addClass('elgg-state-disabled');
$('body').addClass('elgg-state-loading');
spinner.start();
},
complete: function () {
$form.find('[type="submit"]').prop('disabled', false).removeClass('elgg-state-disabled');
$('body').removeClass('elgg-state-loading');
spinner.stop();
},
success: function (data) {
if (data.status >= 0) {
Expand Down

0 comments on commit 077b017

Please sign in to comment.