jenkins-bot has submitted this change and it was merged.
Change subject: Update jquery.uls to 36478fa55a0
......................................................................
Update jquery.uls to 36478fa55a0
* Multiple css selector renaming
* Hide misplaced borders in the compact design
* Fix the jQuery migration warnings for jQuery 1.11.1
Bug: 65400
Change-Id: I4a2542b3b745b8b749845a7e8dbb926dd5c4f0e4
---
M lib/jquery.uls/css/jquery.uls.compact.css
M lib/jquery.uls/css/jquery.uls.css
M lib/jquery.uls/css/jquery.uls.mobile.css
M lib/jquery.uls/src/jquery.uls.core.js
M lib/jquery.uls/src/jquery.uls.lcd.js
5 files changed, 44 insertions(+), 46 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.uls/css/jquery.uls.compact.css
b/lib/jquery.uls/css/jquery.uls.compact.css
index a958c80..f5e6e07 100644
--- a/lib/jquery.uls/css/jquery.uls.compact.css
+++ b/lib/jquery.uls/css/jquery.uls.compact.css
@@ -1,6 +1,7 @@
-.uls-compact .icon-close,
-.uls-compact .uls-title,
-.uls-compact .map-block {
+.uls-compact .uls-icon-close,
+.uls-compact .uls-title-region,
+.uls-compact .uls-map-block,
+.uls-compact #uls-settings-block {
display: none !important;
}
@@ -8,7 +9,7 @@
border-radius: 0;
}
-.uls-compact .search {
+.uls-compact .uls-search {
background: white;
border-top: none;
padding: 0.8em 0;
@@ -17,8 +18,8 @@
border-bottom-color: #DDD;
}
-.uls-compact .filterinput,
-.uls-compact .filterinput:focus {
+.uls-compact .uls-filterinput,
+.uls-compact .uls-filterinput:focus {
background-color: transparent;
border: none;
box-shadow: none;
@@ -32,7 +33,7 @@
height: 20em;
}
-.uls-compact .search-label {
+.uls-compact .uls-search-label {
background-size: 25px;
height: 26px;
width: 26px;
@@ -40,7 +41,7 @@
opacity: 0.8;
}
-.uls-compact .languagefilter-clear {
+.uls-compact .uls-languagefilter-clear {
margin-left: 0;
}
diff --git a/lib/jquery.uls/css/jquery.uls.css
b/lib/jquery.uls/css/jquery.uls.css
index c54dba8..4e80c6b 100644
--- a/lib/jquery.uls/css/jquery.uls.css
+++ b/lib/jquery.uls/css/jquery.uls.css
@@ -115,12 +115,12 @@
-ms-filter:
"progid:DXImageTransform.Microsoft.gradient(startColorstr=#253366bb,
endColorstr=#253366bb)";
}
-.map-block .active {
+.uls-map-block .active {
border-bottom-color: #3366bb;
border-bottom-style: solid;
}
-.uls-menu .row .map-block {
+.uls-menu .row .uls-map-block {
top: 1px;
margin-right: 0;
padding-right: 0;
@@ -133,7 +133,7 @@
transition: opacity 0.2s linear;
}
-.map-block a {
+.uls-map-block a {
color: #333;
opacity: 0;
-moz-transition: opacity 0.15s linear;
@@ -142,25 +142,25 @@
transition: opacity 0.15s linear;
}
-.uls-menu .map-block:hover,
-.uls-menu .map-block:hover a {
+.uls-menu .uls-map-block:hover,
+.uls-menu .uls-map-block:hover a {
opacity: 1;
color: #333;
}
-.map-block .uls-region-1 {
+.uls-map-block .uls-region-1 {
border-color: transparent;
}
-.map-block:hover .active {
+.uls-map-block:hover .active {
border-color: #3366bb;
}
-.map-block .active a {
+.uls-map-block .active a {
font-weight: bold;
}
-.icon-close {
+.uls-icon-close {
/* @embed */
background: transparent url('../images/close.png') no-repeat scroll
center center;
/* @embed */
@@ -172,7 +172,7 @@
cursor: pointer;
}
-.uls-menu .languagefilter {
+.uls-menu .uls-languagefilter {
background-color: transparent;
border: 1px solid #c9c9c9;
border-radius: 2px 2px 2px 2px;
@@ -186,11 +186,11 @@
transition: border 0.15s linear 0s;
}
-.uls-menu .languagefilter:focus {
+.uls-menu .uls-languagefilter:focus {
border: 1px solid #3366bb;
}
-.uls-menu .search {
+.uls-menu .uls-search {
position: relative;
filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr='#F0F0F0',
endColorstr='#FBFBFB');
background: #f8f8f8;
@@ -208,7 +208,7 @@
border-bottom-color: #DDD;
}
-.uls-menu .search-label {
+.uls-menu .uls-search-label {
/* @embed */
background: transparent url('../images/search.png') no-repeat scroll
right center;
/* @embed */
@@ -221,7 +221,7 @@
float: right;
}
-.uls-menu .languagefilter-clear {
+.uls-menu .uls-languagefilter-clear {
/* @embed */
background: transparent url('../images/clear.png') no-repeat scroll
left center;
/* @embed */
@@ -235,7 +235,7 @@
margin-left: -32px;
}
-.uls-menu .filterinput {
+.uls-menu .uls-filterinput {
position: absolute;
top: 0;
left: 0;
@@ -245,7 +245,7 @@
text-align: left;
}
-.uls-menu .filtersuggestion {
+.uls-menu .uls-filtersuggestion {
padding: 6px;
background-color: white;
color: #888;
@@ -255,6 +255,6 @@
left: 1px;
}
-.uls-menu .search-input-block {
+.uls-menu .uls-search-input-block {
position: relative;
}
diff --git a/lib/jquery.uls/css/jquery.uls.mobile.css
b/lib/jquery.uls/css/jquery.uls.mobile.css
index 6db4962..5d3e06e 100644
--- a/lib/jquery.uls/css/jquery.uls.mobile.css
+++ b/lib/jquery.uls/css/jquery.uls.mobile.css
@@ -27,8 +27,8 @@
float: left !important;
}
- .uls-mobile div.map-block a,
- .uls-mobile div.map-block {
+ .uls-mobile .uls-map-block a,
+ .uls-mobile .uls-map-block {
opacity: 1 !important;
}
diff --git a/lib/jquery.uls/src/jquery.uls.core.js
b/lib/jquery.uls/src/jquery.uls.core.js
index 5f9d837..f2811f3 100644
--- a/lib/jquery.uls/src/jquery.uls.core.js
+++ b/lib/jquery.uls/src/jquery.uls.core.js
@@ -25,16 +25,15 @@
// Region numbers in id attributes also appear in the langdb.
/*jshint multistr:true */
- template = '\
- <div class="grid uls-menu uls-wide"> \
+ template = '<div class="grid uls-menu uls-wide"> \
<div class="row"> \
- <span id="uls-close" class="icon-close"></span>
\
+ <span id="uls-close"
class="uls-icon-close"></span> \
</div> \
<div class="row"> \
<div class="uls-title-region seven columns">\
<h1 data-i18n="uls-select-language"
class="uls-title">Select Language</h1>\
</div>\
- <div class="five columns map-block"
id="map-block">\
+ <div class="five columns uls-map-block"
id="uls-map-block">\
<div class="row">\
<div data-regiongroup="1"
id="uls-region-1" class="three columns uls-region uls-region-1">\
<a
data-i18n="uls-region-WW">Worldwide</a>\
@@ -58,15 +57,15 @@
</div>\
</div>\
</div>\
- <div id="search" class="row search"> \
+ <div id="search" class="row uls-search"> \
<div class="one column">\
- <span class="search-label"></span>\
+ <span class="uls-search-label"></span>\
</div>\
<div class="ten columns">\
- <div id="search-input-block"
class="search-input-block">\
- <input type="text"
class="filterinput filtersuggestion" id="filtersuggestion" disabled="true"\
- autocomplete="off" />
<input type="text" class="filterinput languagefilter" id="languagefilter"\
-
data-clear="languagefilter-clear" data-suggestion="filtersuggestion"\
+ <div id="uls-search-input-block"
class="uls-search-input-block">\
+ <input type="text"
class="uls-filterinput uls-filtersuggestion" id="uls-filtersuggestion"
disabled="true"\
+ autocomplete="off" />
<input type="text" class="uls-filterinput uls-languagefilter"
id="uls-languagefilter"\
+
data-clear="uls-languagefilter-clear" data-suggestion="uls-filtersuggestion"\
placeholder="Language
search" autocomplete="off" />\
</div>\
</div>\
@@ -75,8 +74,8 @@
</div>\
</div>\
<div class="row uls-language-list"></div>\
- <div class="row" id="settings-block"></div>\
- </div> ';
+ <div class="row" id="uls-settings-block"></div>\
+ </div>';
/*jshint multistr:false */
/**
@@ -100,7 +99,7 @@
this.shown = false;
this.initialized = false;
- this.$languageFilter = this.$menu.find( '#languagefilter' );
+ this.$languageFilter = this.$menu.find( '#uls-languagefilter' );
this.$regionFilters = this.$menu.find( '.uls-region' );
this.$resultsView = this.$menu.find( 'div.uls-language-list' );
@@ -401,13 +400,12 @@
languages: $.uls.data.getAutonyms(), // Languages to be used
for ULS, default is all languages
quickList: null, // Array of language codes or function that
returns such
compact: false, // Show ULS in compact mode
- showRegions: ['WW', 'AM', 'EU', 'ME', 'AF', 'AS', 'PA']
+ showRegions: [ 'WW', 'AM', 'EU', 'ME', 'AF', 'AS', 'PA' ]
};
// Define a dummy i18n function, if jquery.i18n not integrated.
if ( !$.fn.i18n ) {
- $.fn.i18n = function () {
- };
+ $.fn.i18n = function () {};
}
/*
@@ -440,4 +438,4 @@
};
$.fn.uls.Constructor = ULS;
-} ( jQuery ) );
+}( jQuery ) );
diff --git a/lib/jquery.uls/src/jquery.uls.lcd.js
b/lib/jquery.uls/src/jquery.uls.lcd.js
index 3c9b176..7d207bd 100644
--- a/lib/jquery.uls/src/jquery.uls.lcd.js
+++ b/lib/jquery.uls/src/jquery.uls.lcd.js
@@ -25,8 +25,7 @@
var noResultsTemplate, LanguageCategoryDisplay;
/*jshint multistr:true */
- noResultsTemplate = '\
- <div class="twelve columns uls-no-results-view hide">\
+ noResultsTemplate = '<div class="twelve columns uls-no-results-view
hide">\
<h2 data-i18n="uls-no-results-found" class="eleven columns
offset-by-one uls-no-results-found-title">\
No results found\
</h2>\
--
To view, visit https://gerrit.wikimedia.org/r/134622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a2542b3b745b8b749845a7e8dbb926dd5c4f0e4
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: KartikMistry <kartik.mis...@gmail.com>
Gerrit-Reviewer: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
