bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update jquery.uls to 36478fa55a0

Browse Source 
* 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
This commit is contained in:
Santhosh Thottingal
2014-05-21 21:08:56 +05:30
committed by Santhosh
parent 4339bc3126
commit 9ce9fa68b8
5 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/jquery.uls/css/jquery.uls.compact.css
View File

@@ -1,6 +1,7 @@
.uls-compact .icon-close, .uls-compact .uls-icon-close,
.uls-compact .uls-title, .uls-compact .uls-title-region,
.uls-compact .map-block { .uls-compact .uls-map-block,
.uls-compact #uls-settings-block {
display: none !important; display: none !important;
} }
@@ -8,7 +9,7 @@
border-radius: 0; border-radius: 0;
} }
.uls-compact .search { .uls-compact .uls-search {
background: white; background: white;
border-top: none; border-top: none;
padding: 0.8em 0; padding: 0.8em 0;
@@ -17,8 +18,8 @@
border-bottom-color: #DDD; border-bottom-color: #DDD;
} }
.uls-compact .filterinput, .uls-compact .uls-filterinput,
.uls-compact .filterinput:focus { .uls-compact .uls-filterinput:focus {
background-color: transparent; background-color: transparent;
border: none; border: none;
box-shadow: none; box-shadow: none;
@@ -32,7 +33,7 @@
height: 20em; height: 20em;
} }
.uls-compact .search-label { .uls-compact .uls-search-label {
background-size: 25px; background-size: 25px;
height: 26px; height: 26px;
width: 26px; width: 26px;
@@ -40,7 +41,7 @@
opacity: 0.8; opacity: 0.8;
} }
.uls-compact .languagefilter-clear { .uls-compact .uls-languagefilter-clear {
margin-left: 0; margin-left: 0;
} }

34
lib/jquery.uls/css/jquery.uls.css
View File

@@ -115,12 +115,12 @@ div.uls-region {
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#253366bb, endColorstr=#253366bb)"; -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#253366bb, endColorstr=#253366bb)";
} }
.map-block .active { .uls-map-block .active {
border-bottom-color: #3366bb; border-bottom-color: #3366bb;
border-bottom-style: solid; border-bottom-style: solid;
} }
.uls-menu .row .map-block { .uls-menu .row .uls-map-block {
top: 1px; top: 1px;
margin-right: 0; margin-right: 0;
padding-right: 0; padding-right: 0;
@@ -133,7 +133,7 @@ div.uls-region {
transition: opacity 0.2s linear; transition: opacity 0.2s linear;
} }
.map-block a { .uls-map-block a {
color: #333; color: #333;
opacity: 0; opacity: 0;
-moz-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear;
@@ -142,25 +142,25 @@ div.uls-region {
transition: opacity 0.15s linear; transition: opacity 0.15s linear;
} }
.uls-menu .map-block:hover, .uls-menu .uls-map-block:hover,
.uls-menu .map-block:hover a { .uls-menu .uls-map-block:hover a {
opacity: 1; opacity: 1;
color: #333; color: #333;
} }
.map-block .uls-region-1 { .uls-map-block .uls-region-1 {
border-color: transparent; border-color: transparent;
} }
.map-block:hover .active { .uls-map-block:hover .active {
border-color: #3366bb; border-color: #3366bb;
} }
.map-block .active a { .uls-map-block .active a {
font-weight: bold; font-weight: bold;
} }
.icon-close { .uls-icon-close {
/* @embed */ /* @embed */
background: transparent url('../images/close.png') no-repeat scroll center center; background: transparent url('../images/close.png') no-repeat scroll center center;
/* @embed */ /* @embed */
@@ -172,7 +172,7 @@ div.uls-region {
cursor: pointer; cursor: pointer;
} }
.uls-menu .languagefilter { .uls-menu .uls-languagefilter {
background-color: transparent; background-color: transparent;
border: 1px solid #c9c9c9; border: 1px solid #c9c9c9;
border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px;
@@ -186,11 +186,11 @@ div.uls-region {
transition: border 0.15s linear 0s; transition: border 0.15s linear 0s;
} }
.uls-menu .languagefilter:focus { .uls-menu .uls-languagefilter:focus {
border: 1px solid #3366bb; border: 1px solid #3366bb;
} }
.uls-menu .search { .uls-menu .uls-search {
position: relative; position: relative;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#F0F0F0', endColorstr='#FBFBFB'); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#F0F0F0', endColorstr='#FBFBFB');
background: #f8f8f8; background: #f8f8f8;
@@ -208,7 +208,7 @@ div.uls-region {
border-bottom-color: #DDD; border-bottom-color: #DDD;
} }
.uls-menu .search-label { .uls-menu .uls-search-label {
/* @embed */ /* @embed */
background: transparent url('../images/search.png') no-repeat scroll right center; background: transparent url('../images/search.png') no-repeat scroll right center;
/* @embed */ /* @embed */
@@ -221,7 +221,7 @@ div.uls-region {
float: right; float: right;
} }
.uls-menu .languagefilter-clear { .uls-menu .uls-languagefilter-clear {
/* @embed */ /* @embed */
background: transparent url('../images/clear.png') no-repeat scroll left center; background: transparent url('../images/clear.png') no-repeat scroll left center;
/* @embed */ /* @embed */
@@ -235,7 +235,7 @@ div.uls-region {
margin-left: -32px; margin-left: -32px;
} }
.uls-menu .filterinput { .uls-menu .uls-filterinput {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@@ -245,7 +245,7 @@ div.uls-region {
text-align: left; text-align: left;
} }
.uls-menu .filtersuggestion { .uls-menu .uls-filtersuggestion {
padding: 6px; padding: 6px;
background-color: white; background-color: white;
color: #888; color: #888;
@@ -255,6 +255,6 @@ div.uls-region {
left: 1px; left: 1px;
} }
.uls-menu .search-input-block { .uls-menu .uls-search-input-block {
position: relative; position: relative;
} }

4
lib/jquery.uls/css/jquery.uls.mobile.css
View File

@@ -27,8 +27,8 @@
float: left !important; float: left !important;
} }
.uls-mobile div.map-block a, .uls-mobile .uls-map-block a,
.uls-mobile div.map-block { .uls-mobile .uls-map-block {
opacity: 1 !important; opacity: 1 !important;
} }

32
lib/jquery.uls/src/jquery.uls.core.js
View File

@@ -25,16 +25,15 @@
// Region numbers in id attributes also appear in the langdb. // Region numbers in id attributes also appear in the langdb.
/*jshint multistr:true */ /*jshint multistr:true */
template = '\ template = '<div class="grid uls-menu uls-wide"> \
<div class="grid uls-menu uls-wide"> \
<div class="row"> \ <div class="row"> \
<span id="uls-close" class="icon-close"></span> \ <span id="uls-close" class="uls-icon-close"></span> \
</div> \ </div> \
<div class="row"> \ <div class="row"> \
<div class="uls-title-region seven columns">\ <div class="uls-title-region seven columns">\
<h1 data-i18n="uls-select-language" class="uls-title">Select Language</h1>\ <h1 data-i18n="uls-select-language" class="uls-title">Select Language</h1>\
</div>\ </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 class="row">\
<div data-regiongroup="1" id="uls-region-1" class="three columns uls-region uls-region-1">\ <div data-regiongroup="1" id="uls-region-1" class="three columns uls-region uls-region-1">\
<a data-i18n="uls-region-WW">Worldwide</a>\ <a data-i18n="uls-region-WW">Worldwide</a>\
@@ -58,15 +57,15 @@
</div>\ </div>\
</div>\ </div>\
</div>\ </div>\
<div id="search" class="row search"> \ <div id="search" class="row uls-search"> \
<div class="one column">\ <div class="one column">\
<span class="search-label"></span>\ <span class="uls-search-label"></span>\
</div>\ </div>\
<div class="ten columns">\ <div class="ten columns">\
<div id="search-input-block" class="search-input-block">\ <div id="uls-search-input-block" class="uls-search-input-block">\
<input type="text" class="filterinput filtersuggestion" id="filtersuggestion" disabled="true"\ <input type="text" class="uls-filterinput uls-filtersuggestion" id="uls-filtersuggestion" disabled="true"\
autocomplete="off" /> <input type="text" class="filterinput languagefilter" id="languagefilter"\ autocomplete="off" /> <input type="text" class="uls-filterinput uls-languagefilter" id="uls-languagefilter"\
data-clear="languagefilter-clear" data-suggestion="filtersuggestion"\ data-clear="uls-languagefilter-clear" data-suggestion="uls-filtersuggestion"\
placeholder="Language search" autocomplete="off" />\ placeholder="Language search" autocomplete="off" />\
</div>\ </div>\
</div>\ </div>\
@@ -75,8 +74,8 @@
</div>\ </div>\
</div>\ </div>\
<div class="row uls-language-list"></div>\ <div class="row uls-language-list"></div>\
<div class="row" id="settings-block"></div>\ <div class="row" id="uls-settings-block"></div>\
</div> '; </div>';
/*jshint multistr:false */ /*jshint multistr:false */
/** /**
@@ -100,7 +99,7 @@
this.shown = false; this.shown = false;
this.initialized = 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.$regionFilters = this.$menu.find( '.uls-region' );
this.$resultsView = this.$menu.find( 'div.uls-language-list' ); 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 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 quickList: null, // Array of language codes or function that returns such
compact: false, // Show ULS in compact mode 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. // Define a dummy i18n function, if jquery.i18n not integrated.
if ( !$.fn.i18n ) { if ( !$.fn.i18n ) {
$.fn.i18n = function () { $.fn.i18n = function () {};
};
} }
/* /*
@@ -440,4 +438,4 @@
}; };
$.fn.uls.Constructor = ULS; $.fn.uls.Constructor = ULS;
} ( jQuery ) ); }( jQuery ) );

3
lib/jquery.uls/src/jquery.uls.lcd.js
View File

@@ -25,8 +25,7 @@
var noResultsTemplate, LanguageCategoryDisplay; var noResultsTemplate, LanguageCategoryDisplay;
/*jshint multistr:true */ /*jshint multistr:true */
noResultsTemplate = '\ noResultsTemplate = '<div class="twelve columns uls-no-results-view hide">\
<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">\ <h2 data-i18n="uls-no-results-found" class="eleven columns offset-by-one uls-no-results-found-title">\
No results found\ No results found\
</h2>\ </h2>\