Skip to content
This repository has been archived by the owner on Aug 30, 2019. It is now read-only.

Commit

Permalink
feat(spinner): use core spinner
Browse files Browse the repository at this point in the history
BREAKING CHANGE
showLoader and hideLoader events are no longer triggered. Core elgg/spinner is
used instead.
  • Loading branch information
hypeJunction committed Feb 23, 2016
1 parent 58e804b commit 65e8f3e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 32 deletions.
4 changes: 0 additions & 4 deletions README.md
Expand Up @@ -92,8 +92,4 @@ $('.elgg-list').on('ready', callback);
// Callback will receive list options as a second parameter
$('.elgg-list').on('change', callback);

// Event triggered whenever a spinner is shown and hidden
$('.elgg-list').on('showLoader', callback);
$('.elgg-list').on('hideLoader', callback);

```
3 changes: 2 additions & 1 deletion views/default/components/list.js
Expand Up @@ -3,7 +3,8 @@ define('hypeList', [
'elgg',
'components/list/defaults',
'components/list/list',
'components/list/pagination'
'components/list/pagination',
'elgg/spinner'
], function ($, elgg, defaults, hypeList, hypeListPagination) {

/**
Expand Down
20 changes: 0 additions & 20 deletions views/default/components/list/init.js
Expand Up @@ -15,24 +15,4 @@ define(function (require) {
$container.addClass('elgg-state-ready');
});
});

$(document).on('showLoader.spinner', '.elgg-list,.elgg-gallery', function () {
if (require.defined('elgg/spinner')) {
require(['elgg/spinner'], function (spinner) {
spinner.start();
});
} else {
var cl = $(this).data('classLoading') || 'elgg-state-loading';
$('body').addClass(cl);
}
}).on('hideLoader.spinner', '.elgg-list,.elgg-gallery', function () {
if (require.defined('elgg/spinner')) {
require(['elgg/spinner'], function (spinner) {
spinner.stop();
});
} else {
var cl = $(this).data('classLoading') || 'elgg-state-loading';
$('body').removeClass(cl);
}
});
});
11 changes: 4 additions & 7 deletions views/default/components/list/list.js
Expand Up @@ -2,7 +2,8 @@ define(function (require) {

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

var spinner = require('elgg/spinner');

/**
* List constructor
*
Expand Down Expand Up @@ -672,12 +673,8 @@ define(function (require) {
// Element has been removed, so there is no reason for other handlers to do anything
return false;
},
showLoader: function () {
this.$elem.trigger('showLoader');
},
hideLoader: function () {
this.$elem.trigger('hideLoader');
}
showLoader: spinner.start,
hideLoader: spinner.stop
};

return hypeList;
Expand Down

0 comments on commit 65e8f3e

Please sign in to comment.