diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/README.md b/README.md index 3331535..60eb443 100644 --- a/README.md +++ b/README.md @@ -24,37 +24,37 @@ Here are the most important lines: ```html - - - + + + ``` ```js // callback function for language change function changeLanguage(selectedLanguage) { - var url = updateLangParameter(window.location.href, selectedLanguage); - // Note updateLangParameter() is not shown here. It adds or replaces the language parameter of the document URL. - // Look at the demo page for an implementation if you need one. - window.location.href = url; // make it easy, just reload the page using the changed parameter + var url = updateLangParameter(window.location.href, selectedLanguage); + // Note updateLangParameter() is not shown here. It adds or replaces the language parameter of the document URL. + // Look at the demo page for an implementation if you need one. + window.location.href = url; // make it easy, just reload the page using the changed parameter } // initialize the map var osm = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { - maxZoom: 18, attribution: '[insert correct attribution here!]' }); + maxZoom: 18, attribution: '[insert correct attribution here!]' }); var map = L.map('map', { center: new L.LatLng(51.5, 10), zoom: 10, layers: [osm] }); var baseMaps = { "OSM Standard": osm }; L.control.layers(baseMaps).addTo(map); // Now the interesting stuff, the new languageselector: map.addControl(L.languageSelector({ - languages: new Array( - L.langObject('en', 'English', 'en.png'), - L.langObject('de', 'Deutsch', 'de.png'), - L.langObject('fr', 'Français', 'fr.png'), - L.langObject('ru', 'Русский', 'ru.png') - ), - callback: changeLanguage + languages: new Array( + L.langObject('en', 'English', 'en.png'), + L.langObject('de', 'Deutsch', 'de.png'), + L.langObject('fr', 'Français', 'fr.png'), + L.langObject('ru', 'Русский', 'ru.png') + ), + callback: changeLanguage })); ``` @@ -84,4 +84,8 @@ If you provide an image, the image will be displayed as a symbol for the languag *leaflet-languageselector.css* is used to style the components of the control. Adapt it as you like. ## Language images -No images are provided here. If you need some, there are a lot of free ones out there in the universe. For example http://commons.wikimedia.org/ or http://famfamfam.com/lab/icons/flags/ ("These flag icons are available for free use for any purpose with no requirement for attribution"). +Only some images are provided here - look at [Image info](/images/image_info.md). If you need more, there are a lot of free ones out there in the universe. For example https://openclipart.org/, http://commons.wikimedia.org/ or http://famfamfam.com/lab/icons/flags/ ("These flag icons are available for free use for any purpose with no requirement for attribution"). + +## Best practice for presenting languages +Consider these clues about [Best practice for presenting languages](http://www.flagsarenotlanguages.com/blog/best-practice-for-presenting-languages/). + diff --git a/demo/demo.css b/demo/demo.css new file mode 100644 index 0000000..213fa0e --- /dev/null +++ b/demo/demo.css @@ -0,0 +1,27 @@ +body { + padding: 0; + margin: 0; +} + +#map { + position: absolute; + width: 100%; + height: 100%; + z-index: 0; +} + +#information { + font-size: 13px; + margin: auto; + position: absolute; + left: 0; + right: 0; + top: 20%; + width: 50%; + background-color: rgba(255, 255, 255, 0.85); + box-shadow: 0 0 10px DimGray; + z-index: 7; + line-height: 150%; + padding: 10px; + border-radius: 10px; +} \ No newline at end of file diff --git a/demo/demo.html b/demo/demo.html new file mode 100644 index 0000000..d12358f --- /dev/null +++ b/demo/demo.html @@ -0,0 +1,24 @@ + + + + Demo of leaflet-languageselector + + + + + + + + +
+
+

Demo of leaflet-languageselector

+

This is a demo page of the leaflet plugin leaflet-languageselector. Here you can see 16 different versions of this language selector for Leaflet.

+

When a language is clicked a lang parameter will be added to the URL. Doing the language change is then up to the caller.

+

Documention you will find on the GitHub page.

+
+ + + + + \ No newline at end of file diff --git a/demo/demo.js b/demo/demo.js new file mode 100644 index 0000000..b1015f9 --- /dev/null +++ b/demo/demo.js @@ -0,0 +1,219 @@ +"use strict"; + +function main() { + let map = L.map('map', { + zoomControl: false + }).setView([0, 0], 2); + + L.tileLayer('https://{s}.tile.osm.org/{z}/{x}/{y}.png', { + attribution: '© OpenStreetMap contributors' + }).addTo(map); + + + let languageArray = [ + L.langObject('de', 'Deutsch'), + L.langObject('en', 'English'), + L.langObject('eo', 'Esperanto'), + L.langObject('fi', 'Suomi'), + L.langObject('fr', 'Français'), + L.langObject('ru', 'Русский') + ]; + let languageArrayWithIcons = [ + L.langObject('de', 'Deutsch', '../images/de.svg'), + L.langObject('en', 'English', '../images/en.svg'), + L.langObject('eo', 'Esperanto', '../images/eo.svg'), + L.langObject('fi', 'Suomi', '../images/fi.svg'), + L.langObject('fr', 'Français', '../images/fr.svg'), + L.langObject('ru', 'Русский', '../images/ru.svg') + ]; + + + // bottomtopleftleft: Add vertical versions as button + L.languageSelector({ + languages: languageArray, + callback: changeLanguage, + title: 'Language', + vertical: true, + position: 'topleft', + button: true + }).addTo(map); + L.languageSelector({ + languages: languageArray, + callback: changeLanguage, + vertical: true, + position: 'topleft', + button: true + }).addTo(map); + L.languageSelector({ + languages: languageArrayWithIcons, + callback: changeLanguage, + title: 'Language', + vertical: true, + position: 'topleft', + button: true + }).addTo(map); + L.languageSelector({ + languages: languageArrayWithIcons, + callback: changeLanguage, + vertical: true, + position: 'topleft', + button: true + }).addTo(map); + + // topright: Add horizontal versions as button + L.languageSelector({ + languages: languageArray, + callback: changeLanguage, + title: 'Language', + vertical: false, + position: 'topright', + button: true + }).addTo(map); + L.languageSelector({ + languages: languageArray, + callback: changeLanguage, + vertical: false, + position: 'topright', + button: true + }).addTo(map); + L.languageSelector({ + languages: languageArrayWithIcons, + callback: changeLanguage, + title: 'Language', + vertical: false, + position: 'topright', + button: true + }).addTo(map); + L.languageSelector({ + languages: languageArrayWithIcons, + callback: changeLanguage, + vertical: false, + position: 'topright', + button: true + }).addTo(map); + + // bottomright: Add vertical versions as button + L.languageSelector({ + languages: languageArray, + callback: changeLanguage, + vertical: true, + position: 'bottomright', + button: false + }).addTo(map); + L.languageSelector({ + languages: languageArray, + callback: changeLanguage, + title: 'Language', + vertical: true, + position: 'bottomright', + button: false + }).addTo(map); + L.languageSelector({ + languages: languageArrayWithIcons, + callback: changeLanguage, + vertical: true, + position: 'bottomright', + button: false + }).addTo(map); + L.languageSelector({ + languages: languageArrayWithIcons, + callback: changeLanguage, + title: 'Language', + vertical: true, + position: 'bottomright', + button: false + }).addTo(map); + + // bottomleft: Add horizontal versions as button + L.languageSelector({ + languages: languageArray, + callback: changeLanguage, + vertical: false, + position: 'bottomleft', + button: false + }).addTo(map); + L.languageSelector({ + languages: languageArray, + callback: changeLanguage, + title: 'Language', + vertical: false, + position: 'bottomleft', + button: false + }).addTo(map); + L.languageSelector({ + languages: languageArrayWithIcons, + callback: changeLanguage, + vertical: false, + position: 'bottomleft', + button: false + }).addTo(map); + L.languageSelector({ + languages: languageArrayWithIcons, + callback: changeLanguage, + title: 'Language', + vertical: false, + position: 'bottomleft', + button: false + }).addTo(map); + +} + +/** + * Add or replace the language parameter of the URL and reload the page. + * @param String id of the language + */ +function changeLanguage(selectedLanguage) { + window.location.href = updateURLParameter(window.location.href, 'lang', selectedLanguage); +} + +/** + * Add or replace a parameter (with value) in the given URL. + * @param String url the URL + * @param String param the parameter + * @param String paramVal the value of the parameter + * @return String the changed URL + */ +function updateURLParameter(url, param, paramVal) { + let theAnchor = null; + let newAdditionalURL = ""; + let tempArray = url.split("?"); + let baseURL = tempArray[0]; + let additionalURL = tempArray[1]; + let temp = ""; + + if (additionalURL) { + let tmpAnchor = additionalURL.split("#"); + let theParams = tmpAnchor[0]; + theAnchor = tmpAnchor[1]; + if (theAnchor) { + additionalURL = theParams; + } + + tempArray = additionalURL.split("&"); + + for (let i = 0; i < tempArray.length; i++) { + if (tempArray[i].split('=')[0] != param) { + newAdditionalURL += temp + tempArray[i]; + temp = "&"; + } + } + } else { + let tmpAnchor = baseURL.split("#"); + let theParams = tmpAnchor[0]; + theAnchor = tmpAnchor[1]; + + if (theParams) { + baseURL = theParams; + } + } + + if (theAnchor) { + paramVal += "#" + theAnchor; + } + + let rows_txt = temp + "" + param + "=" + paramVal; + return baseURL + "?" + newAdditionalURL + rows_txt; +} + + +main(); diff --git a/images/de.svg b/images/de.svg new file mode 100644 index 0000000..0879e12 --- /dev/null +++ b/images/de.svg @@ -0,0 +1 @@ + diff --git a/images/en.svg b/images/en.svg new file mode 100644 index 0000000..e718fc7 --- /dev/null +++ b/images/en.svg @@ -0,0 +1 @@ + diff --git a/images/eo.svg b/images/eo.svg new file mode 100644 index 0000000..0247466 --- /dev/null +++ b/images/eo.svg @@ -0,0 +1 @@ + diff --git a/images/fi.svg b/images/fi.svg new file mode 100644 index 0000000..48b0b53 --- /dev/null +++ b/images/fi.svg @@ -0,0 +1 @@ + diff --git a/images/fr.svg b/images/fr.svg new file mode 100644 index 0000000..4e39bc4 --- /dev/null +++ b/images/fr.svg @@ -0,0 +1 @@ + diff --git a/images/image_info.md b/images/image_info.md new file mode 100644 index 0000000..1024a54 --- /dev/null +++ b/images/image_info.md @@ -0,0 +1,27 @@ +# Language images + +We only take images that are public domain. + +## From [Open Clipart](https://openclipart.org/) + +**License**: [Creative Commons Zero 1.0 Public Domain](https://openclipart.org/share "Creative Commons Zero 1.0 Public Domain") + +- de.svg: https://openclipart.org/detail/296539/german-flag +- en.svg: https://openclipart.org/detail/326131/flag-uk +- eo.svg: https://openclipart.org/detail/91837/esperanta-flago +- fi.svg: https://openclipart.org/detail/17744/flag-of-finland +- fr.svg: https://openclipart.org/detail/246307/flag-of-france +- ru.svg: https://openclipart.org/detail/258414/Flag-of-Russia + +All images are edited with the following steps: +- changed size to 24x16 px (Inkscape) + - it's important that the svg files contain: width="24" height="16" +- size optimized with [SVGOMG](https://jakearchibald.github.io/svgomg/) +- removed manually unnecessary IDs (with text editor) + + +## Translation symbol + +**License**: [Creative Commons Zero 1.0 Public Domain](https://openclipart.org/share "Creative Commons Zero 1.0 Public Domain") + +Self created with chinese letter 文 and latin letter A. \ No newline at end of file diff --git a/images/ru.svg b/images/ru.svg new file mode 100644 index 0000000..ef54e93 --- /dev/null +++ b/images/ru.svg @@ -0,0 +1 @@ + diff --git a/images/translation-symbol.svg b/images/translation-symbol.svg new file mode 100644 index 0000000..a0e2c6c --- /dev/null +++ b/images/translation-symbol.svg @@ -0,0 +1,7 @@ + + diff --git a/leaflet-languageselector.css b/leaflet-languageselector.css index d6ce082..37be0c3 100644 --- a/leaflet-languageselector.css +++ b/leaflet-languageselector.css @@ -1,23 +1,58 @@ +/* Button stlye */ +.leaflet-control-languageselector-button { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cdefs/%3E%3Cpath d='M8.9 5.8c-.6 2-1.4 3.7-2.4 5-1-1.3-1.9-3-2.5-5zm4 0v-2H7.2V1H5.7v2.8H.2v2h2a23 23 0 003 6.7 13.4 13.4 0 01-5.2 3l1 2c2.1-.8 4-2 5.4-3.5 1.5 1.6 3.3 2.8 5.5 3.5.2-.6.8-1.6 1.2-2-2.1-.7-3.9-1.7-5.3-3.1a20 20 0 003-6.6zm4.6 2.6L15 16.9h4.8zm-1.4-2h2.8L24 23h-3l-.6-4.3h-5.9l-.8 4.3H11z'/%3E%3C/svg%3E"); + background-position: center; + background-repeat: no-repeat; + background-size: 24px; + display: block; + height: 30px; + width: 30px; +} + + +/* Hide title and languages when button is active */ +.leaflet-control-languageselector-button > .leaflet-languageselector-title, +.leaflet-control-languageselector-button > .leaflet-languageselector-languagesdiv { + display: none; +} + + +/* Flag stlye */ +.leaflet-languageselector-langdiv > img { + border-style: solid; + border-width: 1px; + border-color: rgba(0,0,0,0.2); + border-radius: 3px; + display: block; + margin-left: auto; + margin-right: auto; +} + + +/* Title stlye */ .leaflet-languageselector-title { - font-size: larger; - font-weight: bold; - display: block; - position: relative; + font-size: larger; + font-weight: bold; + text-align: center; + padding: 5px; } .leaflet-languageselector-float-left { - float: left; + float: left; } .leaflet-languageselector-mleft { - margin-left: 7px; } .leaflet-languageselector-langdiv { - cursor: pointer; + cursor: pointer; + padding: 7px 3px 3px 3px; } -.leaflet-languageselector-clearfloat { - clear: all; +.leaflet-languageselector-langdiv:hover { + background-color: LightGrey; } +.leaflet-languageselector-clearfloat { + clear: both; +} diff --git a/leaflet-languageselector.js b/leaflet-languageselector.js index 048ac42..3b7025f 100644 --- a/leaflet-languageselector.js +++ b/leaflet-languageselector.js @@ -1,3 +1,4 @@ +"use strict"; /** * Adds a language selector to Leaflet based maps. * License: CC0 (Creative Commons Zero), see http://creativecommons.org/publicdomain/zero/1.0/ @@ -5,101 +6,140 @@ **/ L.LanguageSelector = L.Control.extend({ - options: { - languages: new Array() - , callback: null - , title: null - , position: 'topright' - , hideSelected: false - , vertical: false - , initialLanguage: null - }, - - initialize: function(options) { - this._buttons = new Array(); - L.Util.setOptions(this, options); - this._container = L.DomUtil.create('div', - 'leaflet-control-layers leaflet-control-layers-expanded leaflet-languageselector-control'); - L.DomEvent.disableClickPropagation(this._container); - this._createLanguageSelector(this._container); - }, - - onAdd: function(map) { - this._map = map; - return this._container; - }, - - onRemove: function(map) { - this._container.style.display = 'none'; - this._map = null; - }, - - _createLanguageSelector: function(container) { - if (this.options.title) { - var titleDiv = L.DomUtil.create('div', 'leaflet-languageselector-title', container); - titleDiv.innerHTML = this.options.title; - } - var languagesDiv = L.DomUtil.create('div', 'leaflet-languageselector-languagesdiv', container); - for (var i1=0; i1 0 ? ' leaflet-languageselector-mleft' : ''), languagesDiv); - if (lang.image) { - var img = L.DomUtil.create('img', '', langDiv); - img.src = lang.image; - img.title = (lang.displayText ? lang.displayText : lang.id); - } else { - langDiv.innerHTML = lang.displayText ? lang.displayText : lang.id; - } - langDiv.id = 'languageselector_' + lang.id; - langDiv._langselinstance = this; - if (langDiv.addEventListener) { - langDiv.addEventListener('click', this._languageChanged, false); - } else { - langDiv.attachEvent('onclick', this._languageChanged); - } - if (this.options.hideSelected && this.options.initialLanguage && this.options.initialLanguage == lang.id) { - langDiv.style.display = 'none'; - } - this._buttons.push(langDiv); - } - }, - - _languageChanged: function(pEvent) { - var elem = pEvent.target; - if (!elem._langselinstance) { - elem = elem.parentElement; - } - var inst = elem._langselinstance; - var lang = elem.id.substr(0,17) == 'languageselector_' ? elem.id.substr(17) : null; - - // hide language button - if (inst.options.hideSelected) { - for (var i=0; i 0 ? ' leaflet-languageselector-mleft' : ''), languagesDiv); + if (lang.image) { + let img = L.DomUtil.create('img', '', langDiv); + img.src = lang.image; + img.title = (lang.displayText ? lang.displayText : lang.id); + } else { + langDiv.innerHTML = lang.displayText ? lang.displayText : lang.id; + } + langDiv.id = 'languageselector_' + lang.id; + langDiv._langselinstance = this; + if (langDiv.addEventListener) { + langDiv.addEventListener('click', this._languageChanged, false); + } else { + langDiv.attachEvent('onclick', this._languageChanged); + } + if (this.options.hideSelected && this.options.initialLanguage && this.options.initialLanguage == lang.id) { + langDiv.style.display = 'none'; + } + this._buttons.push(langDiv); + } + }, + + _languageChanged: function(pEvent) { + let elem = pEvent.target; + if (!elem._langselinstance) { + elem = elem.parentElement; + } + let inst = elem._langselinstance; + let lang = elem.id.substr(0, 17) == 'languageselector_' ? elem.id.substr(17) : null; + + // hide language button + if (inst.options.hideSelected) { + for (let i = 0; i < inst._buttons.length; i++) { + let b = inst._buttons[i]; + if (b.id == elem.id) { + b.style.display = 'none'; + } else { + b.style.display = 'block'; + } + } + } + + // callback + if (inst.options.callback && typeof inst.options.callback == 'function') { + inst.options.callback(lang); + } + }, + + _isButton: function() { + return L.DomUtil.hasClass(this._container, this.options.buttonClassName); + }, + + _toggleButton: function() { + if (this._isButton()) { + L.DomUtil.removeClass(this._container, this.options.buttonClassName); + } else { + L.DomUtil.addClass(this._container, this.options.buttonClassName); + } + }, + + _fireMouseOver: function(e) { + this.fire('mouseover'); + this._toggleButton(); + }, + + _fireMouseOut: function(e) { + if (!this._isButton()) { + this.fire('mouseout'); + this._toggleButton(); + } + }, }); L.langObject = function(langId, text, img) { - return { - id: langId, - displayText: text, - image: img - } + return { + id: langId, + displayText: text, + image: img + } }; -L.languageSelector = function(options) { return new L.LanguageSelector(options); }; +L.languageSelector = function(options) { + return new L.LanguageSelector(options); +}; diff --git a/package.json b/package.json index 4d9f084..48c32b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leaflet-languageselector", - "version": "1.0.7", + "version": "1.1.0", "description": "A language selector for Leaflet based maps", "main": "leaflet-languageselector.js", "repository": {