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

Revert "Update jquery.uls to a9dc11b"

Browse Source 
Breaks VisualEditor by throwing exceptions on most key
presses and selection changes, which causes Enter and Tab
to behave very badly in VE.

This reverts commit 3499b0a1b9.

Bug: T144871
Change-Id: I0518b056e6946341cf29eb3f16378702d37086a5
This commit is contained in:
Catrope
2016-09-07 00:47:01 +00:00
parent 3499b0a1b9
commit 1400354f43
17 changed files with 139 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,4 @@
.uls-trigger {
/* @embed */
background: transparent url('../images/icon-language.png') no-repeat scroll left center;
@@ -50,9 +51,64 @@
min-width: 150px;
}
.uls-title-region a {
padding-left: 15px;
}
.uls-menu .uls-title {
font-weight: normal;
border: none;
padding-left: 15px;
font-size: 18pt;
line-height: 1.25em;
color: #555;
}
.uls-menu .uls-no-results-found-title {
font-size: 16pt;
font-weight: bold;
line-height: 1.5em;
padding-left: 6px;
padding-top: 10px;
margin-top: 0;
margin-bottom: 15px;
border-bottom: none;
color: #555;
}
.uls-menu .uls-lcd-region-section .uls-lcd-region-title {
color: #777;
font-size: 14pt;
font-weight: lighter;
line-height: 1.5em;
padding-left: 0;
margin-top: 0;
margin-bottom: 10px;
border-bottom: none;
}
div.uls-region {
cursor: pointer;
padding: 0;
margin: 0;
height: 120px;
border-bottom-color: transparent;
border-bottom-style: solid;
border-bottom-width: 2px;
}
.uls-region a {
bottom: 2px;
left: 2px;
padding: 0;
position: absolute;
font-size: 13px;
line-height: 1.2em;
text-decoration: none;
overflow: hidden;
text-overflow: ellipsis;
width: 99%;
}
.uls-search {
background-color: white;
padding: 5px 16px;
padding: 5px;
border-bottom-width: 1px;
border-bottom-style: solid;
border-bottom-color: #DDD;
@@ -65,7 +121,7 @@
/* Make space for magnifying class on the front */
.uls-search-wrapper {
position: relative;
padding-left: 44px;
padding-left: 40px;
margin-right: 5px;
height: 32px;
}
@@ -75,10 +131,10 @@
background-image: -webkit-linear-gradient(transparent, transparent), url('../images/search.svg');
/* @embed */
background-image: linear-gradient(transparent, transparent), url('../images/search.svg');
background-size: 20px;
background-size: 28px;
background-position: center center;
height: 32px;
width: 44px;
width: 40px;
display: block;
position: absolute;
left: 0;
@@ -91,7 +147,7 @@
/* There are two input boxes. This class applies to both of them */
.uls-filterinput {
font-size: 16px;
font-size: 18px;
height: 32px;
width: 100%;
/* For the custom clear (X) icon */

91
lib/jquery.uls/css/jquery.uls.lcd.css
View File

@@ -1,12 +1,13 @@
/*
* Language Category Display (LCD) consists of multiple sections:
* - one to display when there are no search results (which might display suggested languages)
* - one for each region of the world, plus regions for world languages and suggested languages
* The regions consist of one or more rows (blocks) which consist of one-to-four columns. Each
* column is an ul element, and contains up to 8 li elements, each containing a link.
*/
.uls-lcd-region-section ul li:hover {
background-color: #eaeff7;
}
.uls-lcd {
.uls-lcd-region-section {
margin-top: 10px;
}
/* Language list */
.uls-language-list {
height: 20em;
/* Work around Chrome bug where it places scrollbar on the left in
* in RTL mode but actually reserves the place on the right side */
@@ -14,47 +15,13 @@
overflow-y: auto;
width: auto;
background: #FCFCFC;
padding: 0 16px;
}
.uls-lcd-region-section {
margin-top: 10px;
.uls-language-block ul {
margin: 0 0 1.5em;
}
.uls-lcd-region-title {
color: #777;
font-size: 14px;
padding-left: 28px;
}
/*
* We need to have this as a grid row to push rest of the content below it, but resetting
* padding and margin so that calculating them for children is easier.
*/
.grid .uls-language-block.row {
padding: 0;
margin: 0;
}
/*
* Each block should have 16px padding on both sides. But because we already gave
* 16px for the whole menu, we need to remove it for first and last items the blocks.
*/
.grid .uls-language-block > ul {
margin: 0 0 20px 0;
padding: 0 16px;
}
.grid .uls-language-block > ul:first-child {
padding-left: 0;
}
.grid .uls-language-block > ul:last-child {
padding-right: 0;
}
.uls-language-block > ul {
.uls-language-list ul {
/*
* We don't want any visible bullets in this list. Not by default anyway.
* Using very unspecific selector here to allow other classes to override.
@@ -65,10 +32,8 @@
list-style-type: none;
}
.uls-language-block > ul > li {
.uls-language-list li {
cursor: pointer;
margin-left: 20px;
padding: 8px;
/*
* The directionality (ltr/rtl) for each list item is set dynamically
* as HTML attributes in JavaScript. Setting directionality also applies
@@ -81,15 +46,17 @@
text-align: left;
}
.uls-language-block > ul > li:hover {
background-color: #eaeff7;
/* TODO: looks unused */
.uls-language-list strong {
text-decoration: underline;
}
.uls-language-block a {
cursor: pointer;
.uls-language-list a {
font-weight: normal;
text-decoration: none;
color: #3366bb;
font-size: 14px;
line-height: 1.6em;
display: inline-block;
width: 100%;
overflow: hidden;
@@ -104,22 +71,16 @@
vertical-align: middle;
}
/* TODO: ugly hack that forces last matching search results to shift down.
* They should be hidden properly.
*/
.uls-language-block {
width: 100%;
}
.uls-no-results-view {
color: #555;
height: 100%;
}
.uls-no-results-found-title {
font-size: 16px;
padding: 0 16px 0 28px;
border-bottom: none;
color: #555;
}
.uls-no-found-more {
padding: 0 16px 0 44px;
font-size: 0.9em;
background: #F8F8F8;
width: 100%;
@@ -129,3 +90,7 @@
bottom: 0;
left: 0;
}
.uls-no-found-more a {
cursor: pointer;
}

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

@@ -22,6 +22,11 @@
line-height: 1.7em;
}
.uls-mobile div.uls-region {
width: 33% !important;
float: left !important;
}
.uls-mobile .row {
width: auto;
min-width: 0;

4
lib/jquery.uls/i18n/ar.json
View File

@@ -15,8 +15,8 @@
"uls-region-ME": "الشرق الأوسط",
"uls-region-PA": "المحيط الهادئ",
"uls-no-results-found": "لم يتم العثور على نتائج",
"uls-common-languages": "اللغات المقترحة",
"uls-common-languages": "لغات مشتركة",
"uls-no-results-suggestion-title": "قد تكون مهتم في:",
"uls-search-help": "يمكنك البحث بواسطة اسم اللغة, اسم السكريبت, رمز اللغة القياسي أو يمكنك التصفح حسب المنطقة.",
"uls-search-help": "يمكنك البحث بواسطة اسم اللغة, اسم السكريبت, رمز اللغة القياسي أو يمكنك تصفح حسب المنطقة:",
"uls-search-placeholder": "بحث عن لغة"
}

6
lib/jquery.uls/i18n/dty.json
View File

@@ -1,8 +1,7 @@
{
"@metadata": {
"authors": [
"रमेश सिंह बोहरा",
"Nirajan pant"
"रमेश सिंह बोहरा"
]
},
"uls-region-WW": "विश्वभर",
@@ -14,8 +13,7 @@
"uls-region-ME": "मध्य पूर्व",
"uls-region-PA": "प्रशान्त",
"uls-no-results-found": "कोइ पन नतिजाहरू नाइभेटिया",
"uls-common-languages": "सुझावित भाषाअन",
"uls-common-languages": "साझो भाषा",
"uls-no-results-suggestion-title": "तमलाई यैमी मन लाग्गसकन्छ:",
"uls-search-help": "तम भषा: नाउँले, लिपिया नाउँले, भषा: ISO कोड खोजिसकन्छ: या क्षेत्रा आधारमी ब्राउज अरिसकन्छ:।",
"uls-search-placeholder": "भाषा खोज अर"
}

1
lib/jquery.uls/i18n/en.json
View File

@@ -13,7 +13,6 @@
"uls-region-AS": "Asia",
"uls-region-ME": "Middle East",
"uls-region-PA": "Pacific",
"uls-region-all": "All languages",
"uls-no-results-found": "No results found",
"uls-common-languages": "Suggested languages",
"uls-no-results-suggestion-title": "You may be interested in:",

2
lib/jquery.uls/i18n/glk.json
View File

@@ -12,7 +12,7 @@
"uls-region-AS": "آسيا",
"uls-region-ME": "مئني خۊرتؤ",
"uls-region-PA": "اۊقيانۊسˇ آرؤم",
"uls-no-results-found": "نتيجه-اي وامته نۊبؤ",
"uls-no-results-found": "نتيجه-اي وامۊته نۊبؤ",
"uls-common-languages": "راىجˇ زوانؤن",
"uls-no-results-suggestion-title": "مۊمکنه خۊش بدأرين:",
"uls-search-help": "شۊمۊ تؤنين زوانˇ نؤمˇ أمرأ، رسم الخط، زوانˇ ايزؤ کؤد ىا شيمي سامؤنˇ أمرأ وامجين.",

2
lib/jquery.uls/i18n/oc.json
View File

@@ -13,7 +13,7 @@
"uls-region-ME": "Orient Mejan",
"uls-region-PA": "Pacific",
"uls-no-results-found": "Cap de resultat pas trobat",
"uls-common-languages": "Lengas suggeridas",
"uls-common-languages": "Lengas comunas",
"uls-no-results-suggestion-title": "Podètz èsser interessat per :",
"uls-search-help": "Podètz recercar per nom de lenga, per nom de l'escript, per còdi ISO de la lenga, o podètz navigar per region.",
"uls-search-placeholder": "Recèrca de lenga"

1
lib/jquery.uls/i18n/qqq.json
View File

@@ -14,7 +14,6 @@
"uls-region-AS": "Label for Asia",
"uls-region-ME": "Label for Middle East",
"uls-region-PA": "Label for Pacific",
"uls-region-all": "Label for all languages in narrow mode, where languages are not split by region.",
"uls-no-results-found": "Title text for 'No results found' section",
"uls-common-languages": "The ULS tries to guess the langugages that the user is most likely to pick. They are taken from geolocation (languages of the current country according to the IP address), previously selected languages, and the browser's accept-language. The list of these languages appears at the top of the ULS languages list, above the geographical regions. This is the title of that list.\n\nSee also {{msg-mw|Mobile-frontend-languages-structured-overlay-suggested-languages-header}}",
"uls-no-results-suggestion-title": "Title for language suggestion in 'no results found' screen",

2
lib/jquery.uls/i18n/sa.json
View File

@@ -13,7 +13,7 @@
"uls-region-ME": "मध्यभूभागे",
"uls-region-PA": "पॅसिफिक्",
"uls-no-results-found": "परिणामाः न लब्धाः",
"uls-common-languages": "परामर्षिताः भाषाः",
"uls-common-languages": "समान्याः भाषाः",
"uls-no-results-suggestion-title": "एतत् भवते/भवत्यै रोचेत :",
"uls-search-help": "भाषाधारेण, लिप्याधारेण, भाषायाः ISO कूटाधारेण, क्षेत्रानुसारं वा भवान्/भवती अन्वेष्टुं शक्नोति ।",
"uls-search-placeholder": "भाषा अन्विष्यताम्"

4
lib/jquery.uls/i18n/sc.json
View File

@@ -13,8 +13,8 @@
"uls-region-ME": "Oriènte de mesu.",
"uls-region-PA": "Patzìficu",
"uls-no-results-found": "Mancu unu resurtu agatau",
"uls-common-languages": "Limbas impositadas.",
"uls-common-languages": "Limbas prus isseberas.",
"uls-no-results-suggestion-title": "Podes essere interessadu in:",
"uls-search-help": "Podes chircare pro mèdiu de su nùmene de sa limba, su nùmene de su script, su còdighe ISO de sa limba o navigare pro mèdiu de sa regione:",
"uls-search-help": "Podes chircare tràmite nùmene de sa limba, nùmene de su script, còdighe ISO de sa limba o navigare tràmite regione:",
"uls-search-placeholder": "Chirca de sa limba:"
}

7
lib/jquery.uls/i18n/th.json
View File

@@ -1,8 +1,7 @@
{
"@metadata": {
"authors": [
"Octahedron80",
"Pon44695"
"Octahedron80"
]
},
"uls-region-WW": "ทั่วโลก",
@@ -14,8 +13,8 @@
"uls-region-ME": "ตะวันออกกลาง",
"uls-region-PA": "แปซิฟิก",
"uls-no-results-found": "ไม่พบผลลัพธ์",
"uls-common-languages": "ภาษาที่แนะนำ",
"uls-common-languages": "ภาษาสามัญ",
"uls-no-results-suggestion-title": "คุณอาจสนใจใน:",
"uls-search-help": "คุณสามารถค้นหาด้วยชื่อภาษา ชื่ออักษร รหัส ISO ของภาษา หรือสามารถเรียกดูตามภูมิภาค",
"uls-search-help": "คุณสามารถค้นหาด้วยชื่อภาษา ชื่ออักษร รหัส ISO ของภาษา หรือสามารถเรียกดูตามภูมิภาค:",
"uls-search-placeholder": "ค้นหาภาษา"
}

2
lib/jquery.uls/i18n/vi.json
View File

@@ -14,7 +14,7 @@
"uls-region-ME": "Trung Đông",
"uls-region-PA": "Châu Đại Dương",
"uls-no-results-found": "Không tìm thấy kết quả",
"uls-common-languages": "Ngôn ngữ gợi ý",
"uls-common-languages": "Ngôn ngữ thông dụng",
"uls-no-results-suggestion-title": "Bạn có thể quan tâm:",
"uls-search-help": "Bạn có thể tìm kiếm theo tên ngôn ngữ, tên hệ thống chữ viết, hay mã ISO của ngôn ngữ hoặc duyệt theo khu vực.",
"uls-search-placeholder": "Tìm kiếm ngôn ngữ"

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

@@ -91,7 +91,7 @@
this.initialized = false;
this.$languageFilter = this.$menu.find( '#uls-languagefilter' );
this.$resultsView = this.$menu.find( '.uls-language-list' );
this.$resultsView = this.$menu.find( 'div.uls-language-list' );
this.render();
this.listen();
@@ -134,25 +134,15 @@
* @returns {Object}
*/
position: function () {
var pos,
top = this.top,
left = this.left;
var pos;
if ( top === undefined ) {
pos = $.extend( {}, this.$element.offset(), {
height: this.$element[ 0 ].offsetHeight
} );
top = pos.top + pos.height;
}
if ( left === undefined ) {
left = $( window ).width() / 2 - this.$menu.outerWidth() / 2;
}
return {
top: top,
left: left
top: this.top !== undefined ? this.top : pos.top + pos.height,
left: this.left !== undefined ? this.left : '25%'
};
},
@@ -167,6 +157,7 @@
};
this.$menu.addClass( widthClasses[this.getMenuWidth()] );
this.$menu.css( this.position() );
if ( !this.initialized ) {
$( 'body' ).prepend( this.$menu );
@@ -174,7 +165,6 @@
this.initialized = true;
}
this.$menu.css( this.position() );
this.$menu.show();
this.$menu.scrollIntoView();
this.shown = true;
@@ -358,7 +348,7 @@
languagesCount = objectLength( this.options.languages );
if ( languagesCount < 25 ) {
if ( languagesCount < 12 ) {
return 'narrow';
}

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

@@ -24,18 +24,18 @@
var noResultsTemplate, LanguageCategoryDisplay;
noResultsTemplate = $( '<div>' ).addClass( 'uls-no-results-view hide' );
noResultsTemplate = $( '<div>' ).addClass( 'twelve columns uls-no-results-view hide' );
noResultsTemplate.append(
$( '<h2>' )
.attr( 'data-i18n', 'uls-no-results-found' )
.addClass( 'uls-no-results-found-title' )
.addClass( 'eleven columns offset-by-one uls-no-results-found-title' )
.text( 'No results found' ),
$( '<div>' )
.attr( 'id', 'uls-no-found-more' )
.addClass( 'uls-no-found-more' )
.append(
$( '<div>' )
.addClass( '' )
.addClass( 'ten columns offset-by-one' )
.append(
$( '<p>' ).append(
$( '<span>' ).text( 'You can search by language name, script name, ISO code of language or you can browse by region.' )
@@ -47,7 +47,7 @@
LanguageCategoryDisplay = function ( element, options ) {
this.$element = $( element );
this.options = $.extend( {}, $.fn.lcd.defaults, options );
this.$element.addClass( 'uls-lcd' );
this.$element.addClass( 'lcd' );
this.regionLanguages = {};
this.renderTimeout = null;
this.cachedQuicklist = null;
@@ -109,9 +109,8 @@
},
render: function () {
var $section, $quicklist,
var $section,
lcd = this,
narrowMode = this.options.columns === 1,
regions = [],
regionNames = {
// These are fallback text when i18n library not present
@@ -125,16 +124,7 @@
PA: 'Pacific'
};
$quicklist = this.buildQuicklist();
regions.push( $quicklist );
if ( narrowMode && $quicklist.length ) {
regions.push( $( '<h3>' )
.attr( 'data-i18n', 'uls-region-all' )
.addClass( 'uls-lcd-region-title' )
.text( 'All languages' )
);
}
regions.push( this.buildQuicklist() );
$.each( $.uls.data.regiongroups, function ( regionCode ) {
lcd.regionLanguages[ regionCode ] = [];
@@ -145,14 +135,14 @@
}
$section = $( '<div>' )
.addClass( 'uls-lcd-region-section hide' )
.addClass( 'eleven columns offset-by-one uls-lcd-region-section hide' )
.attr( 'id', regionCode );
// Show a region heading, unless we are using a narrow ULS
if ( !narrowMode ) {
if ( lcd.options.columns !== 1 ) {
$section.append( $( '<h3>' )
.attr( 'data-i18n', 'uls-region-' + regionCode )
.addClass( 'uls-lcd-region-title' )
.addClass( 'eleven columns uls-lcd-region-title' )
.text( regionNames[ regionCode ] )
);
}
@@ -316,7 +306,7 @@
this.options.quickList = this.options.quickList();
}
if ( !this.options.quickList.length ) {
if ( !this.options.quickList ) {
this.cachedQuicklist = $( [] );
return this.cachedQuicklist;
}
@@ -327,13 +317,13 @@
quickList.sort( $.uls.data.sortByAutonym );
$quickListSection = $( '<div>' )
.addClass( 'uls-lcd-region-section' )
.addClass( 'eleven columns offset-by-one uls-lcd-region-section' )
.attr( 'id', 'uls-lcd-quicklist' );
$quickListSectionTitle = $( '<h3>' )
.attr( 'data-i18n', 'uls-common-languages' )
.addClass( 'uls-lcd-region-title' )
.text( 'Suggested languages' ); // This is placeholder text if jquery.i18n not present
.addClass( 'eleven columns uls-lcd-region-title' )
.text( 'Common languages' ); // This is placeholder text if jquery.i18n not present
$quickListSection.append( $quickListSectionTitle );
this.renderRegion(
@@ -411,8 +401,7 @@
// Other supported values are 1 and 2.
// Other values will have rendering issues.
columns: 4,
languageDecorator: null,
quicklist: []
languageDecorator: null
};
$.fn.lcd.Constructor = LanguageCategoryDisplay;

5
resources/css/ext.uls.css
View File

@@ -16,11 +16,6 @@
border-bottom-left-radius: 4px;
}
/* Override skin styling, because we are doing it ourselves */
.uls-language-list li {
margin: 0;
}
.uls-menu.callout .caret-before,
.uls-menu.callout .caret-after {
border-top: 10px solid transparent;

9
resources/css/ext.uls.languagesettings.css
View File

@@ -13,6 +13,15 @@
border-radius: 0 0 5px 5px;
}
.uls-menu h3 {
border-bottom: medium none;
font-size: 14pt;
line-height: 1.5em;
margin-bottom: 10px;
margin-top: 0;
padding-left: 0;
}
#languagesettings-panels .languagesettings-menu {
padding-left: 0;
padding-right: 0;