This is an automated email from the git hooks/post-receive script. New commit to branch feature/6393 in repository wao. See http://git.codelutin.com/wao.git commit a6d116c234e63f53d25ddb36ba95faddae8e800c Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 24 16:44:15 2015 +0100 Bouton pour tout sélectionner dans les filtres et tout déselectionner (testable-client #6383) --- wao-web/src/main/webapp/wao.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/wao-web/src/main/webapp/wao.js b/wao-web/src/main/webapp/wao.js index 539d402..2f789f6 100644 --- a/wao-web/src/main/webapp/wao.js +++ b/wao-web/src/main/webapp/wao.js @@ -361,8 +361,12 @@ var OneFilterModel = function (filterMapping, filterModel) { }; this.selectAll = function () { - var allOptions = this.options.slice(0); // copy - this.setSelectedOptions(allOptions); + if (this.selectedOptions.length === 0) { + var allOptions = this.options.slice(0); // copy + this.setSelectedOptions(allOptions); + } else { + this.setSelectedOptions([]); + } }; this.onFilterUpdated = function (filter) { @@ -413,7 +417,7 @@ var OneFilterView = function (oneFilterModel) { + ' <i class="fa fa-check"></i>' + ' </button>' + ' <button type="button" class="btn btn-link select-all-button">' - + ' <i class="fa fa-anchor"></i>' + + ' <i class="fa fa-asterisk"></i>' + ' </button>' + ' </span>' + ' </div>' @@ -578,6 +582,8 @@ var OneFilterController = function (filterMapping, filterModel, filterController this.selectAll = function () { this.model.selectAll(); + this.close(); + this.open(); } }; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.