From 00ff49e1907dc748858bb67fad3d5471806bf458 Mon Sep 17 00:00:00 2001 From: Amire80 Date: Mon, 5 Mar 2018 12:58:00 +0200 Subject: [PATCH] Convert ulsPurpose from a data attribute to an languagefilter option --- src/jquery.uls.core.js | 2 +- src/jquery.uls.languagefilter.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/jquery.uls.core.js b/src/jquery.uls.core.js index 98e1c76..4844f95 100644 --- a/src/jquery.uls.core.js +++ b/src/jquery.uls.core.js @@ -54,7 +54,6 @@ this.$element = $( element ); this.options = $.extend( {}, $.fn.uls.defaults, options ); this.$menu = $( template ); - this.$menu.data( 'uls-purpose', this.options.ulsPurpose ); this.languages = this.options.languages; for ( code in this.languages ) { @@ -231,6 +230,7 @@ this.$languageFilter.languagefilter( { lcd: lcd, languages: this.languages, + ulsPurpose: this.options.ulsPurpose, searchAPI: this.options.searchAPI, onSelect: $.proxy( this.select, this ) } ); diff --git a/src/jquery.uls.languagefilter.js b/src/jquery.uls.languagefilter.js index 3a5e0af..e9732a7 100644 --- a/src/jquery.uls.languagefilter.js +++ b/src/jquery.uls.languagefilter.js @@ -236,7 +236,7 @@ this.$element.trigger( 'noresults.uls', query, - this.$element.parents( '.uls-menu' ).data( 'uls-purpose' ) + this.options.ulsPurpose ); return; } @@ -342,6 +342,10 @@ lcd: undefined, // URL to which we append query parameter with the query value searchAPI: undefined, + // What is this ULS used for. + // Should be set for distinguishing between different instances of ULS + // in the same application. + ulsPurpose: '', // Object of language tags to language names languages: [], // Callback function when language is selected