Skip to content

Commit

Permalink
Merge pull request #11 from unicef-polymer/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
daniel-tabarcea authored Nov 14, 2017
2 parents 98876c6 + 55d3c38 commit 3f25ed8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "etools-loading",
"description": "loading spinner",
"version": "1.1.1",
"version": "1.1.2",
"license": "https://github.com/unicef-polymer/etools-loading/blob/master/LICENSE.md",
"main": "etools-loading.html",
"dependencies": {
Expand Down
6 changes: 6 additions & 0 deletions etools-loading-behavior.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
etoolsBehaviors.LoadingBehavior = { // eslint-disable-line no-undef
listeners: {
'global-loading': 'handleLoading',
'clear-loading-messages': 'clearLoadingQueue',
},
ready: function() {
// create loading element, used for global loading
Expand Down Expand Up @@ -81,6 +82,11 @@
}

}
},
clearLoadingQueue: function(event) {
event.stopImmediatePropagation();
this.globalLoadingElement.messages = [];
this.globalLoadingElement.active = false;
}


Expand Down

0 comments on commit 3f25ed8

Please sign in to comment.