From ca550e22cd0de8ac792e8d0ca81cb8f8259486d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Thu, 7 Sep 2017 10:48:36 +0200 Subject: [PATCH 1/6] Improve how "no search results" is handled * Drop the ugly height: 100% hack and do it properly and remove TODO * after( $suggestions.show() ) seems to not work as expected in recent jQuery versions. Changed it to manipulate the presence of 'hide' class properly. * Consistency fix in a comment * Fixed a bug where creating multiple ULS instances would break the "no search results" functionality. This is because we were appending a jQuery element wrapped in a $(). This is obviously a no-op and a regression when the template actually was a string and not jQuery. Fixed by using clone() on it. https://phabricator.wikimedia.org/T175233 --- css/jquery.uls.lcd.css | 7 ------- src/jquery.uls.core.js | 2 +- src/jquery.uls.lcd.js | 11 +++++++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/css/jquery.uls.lcd.css b/css/jquery.uls.lcd.css index 529b8bc..6c7c932 100644 --- a/css/jquery.uls.lcd.css +++ b/css/jquery.uls.lcd.css @@ -104,13 +104,6 @@ vertical-align: middle; } -/* TODO: ugly hack that forces last matching search results to shift down. - * They should be hidden properly. - */ -.uls-no-results-view { - height: 100%; -} - .uls-no-results-found-title { font-size: 16px; padding: 0 16px 0 28px; diff --git a/src/jquery.uls.core.js b/src/jquery.uls.core.js index 40183f3..a4071e3 100644 --- a/src/jquery.uls.core.js +++ b/src/jquery.uls.core.js @@ -221,7 +221,7 @@ }, /** - * callback for results found context. + * Callback for results found context. */ success: function () { this.$resultsView.show(); diff --git a/src/jquery.uls.lcd.js b/src/jquery.uls.lcd.js index 2295e17..2bba056 100644 --- a/src/jquery.uls.lcd.js +++ b/src/jquery.uls.lcd.js @@ -31,7 +31,6 @@ .addClass( 'uls-no-results-found-title' ) .text( 'No results found' ), $( '
' ) - .attr( 'id', 'uls-no-found-more' ) .addClass( 'uls-no-found-more' ) .append( $( '
' ) @@ -54,7 +53,7 @@ this.renderTimeout = null; this.cachedQuicklist = null; - this.$element.append( $( noResultsTemplate ) ); + this.$element.append( noResultsTemplate.clone() ); this.$noResults = this.$element.children( '.uls-no-results-view' ); this.render(); @@ -175,7 +174,7 @@ lcd = this; this.$noResults.addClass( 'hide' ); - this.$element.find( '.uls-lcd-region-section' ).each( function () { + this.$element.children( '.uls-lcd-region-section' ).each( function () { var $region = $( this ), regionCode = $region.attr( 'id' ); @@ -367,16 +366,20 @@ noResults: function () { this.$noResults.removeClass( 'hide' ); + this.$noResults.siblings( '.uls-lcd-region-section' ).addClass( 'hide' ); + + // Only build the data once if ( this.$noResults.find( '.uls-lcd-region-title' ).length ) { return; } var $suggestions = this.buildQuicklist().clone(); + $suggestions.removeClass( 'hide' ).removeAttr( 'id' ); $suggestions.find( 'h3' ) .data( 'i18n', 'uls-no-results-suggestion-title' ) .text( 'You may be interested in:' ) .i18n(); - this.$noResults.find( 'h2' ).after( $suggestions.show() ); + this.$noResults.find( 'h2' ).after( $suggestions ); }, listen: function () { From 0075ef59bc682ba44022711d4e68c61e818246d0 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 11 Sep 2017 07:22:31 +0200 Subject: [PATCH 2/6] Localisation updates from https://translatewiki.net. --- i18n/kab.json | 5 +++-- i18n/ku-latn.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/i18n/kab.json b/i18n/kab.json index b629e9b..e1aa9d9 100644 --- a/i18n/kab.json +++ b/i18n/kab.json @@ -4,7 +4,8 @@ "Amazigh84", "Mmistmurt", "Mezgoug", - "Belkacem77" + "Belkacem77", + "SlimaneAmiri" ] }, "uls-region-WW": "Deg umaḍal meṛṛa", @@ -20,5 +21,5 @@ "uls-common-languages": "Tutlayin yettusumren", "uls-no-results-suggestion-title": "Ma tebɣiḍ ad tisineḍ ayen nniḍen ɣef :", "uls-search-help": "Tzemreḍ ad tnadiḍ s yisem n tutlayt, s uskript, s tengalt ISO n tutlayt neγ inig s tmnaḍt.", - "uls-search-placeholder": "Anadi n tutlayt" + "uls-search-placeholder": "Anadi γef tutlayt" } diff --git a/i18n/ku-latn.json b/i18n/ku-latn.json index b59d179..32ef6a6 100644 --- a/i18n/ku-latn.json +++ b/i18n/ku-latn.json @@ -4,7 +4,8 @@ "George Animal", "Bikarhêner", "Ghybu", - "Velg" + "Velg", + "Cûndûllah el-Kurdî" ] }, "uls-region-WW": "Li hemû cîhanê", @@ -16,7 +17,7 @@ "uls-region-ME": "Rojhilata Navîn", "uls-region-PA": "Pasîfîk", "uls-region-all": "Hemû ziman", - "uls-no-results-found": "Ti encam nehatin dîtin", + "uls-no-results-found": "Tu encam nehatin dîtin", "uls-common-languages": "Zimanên pêşniyarkirî", "uls-no-results-suggestion-title": "Pêwendîya we dikara bikişîne:", "uls-search-help": "Hûn lêgerîna xwe li gor nava zimanê, koda ISOyê an jî li gor herêmê dikarin bikin.", From 1c1dd1aa4d8c3a9286c3616e99ccb80ab35492b7 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 14 Sep 2017 07:23:49 +0200 Subject: [PATCH 3/6] Localisation updates from https://translatewiki.net. --- i18n/ne.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/i18n/ne.json b/i18n/ne.json index 9e996fe..e861877 100644 --- a/i18n/ne.json +++ b/i18n/ne.json @@ -13,9 +13,10 @@ "uls-region-AS": "एसिया", "uls-region-ME": "मध्य पूर्व", "uls-region-PA": "प्रशान्त", + "uls-region-all": "सबै भाषाहरू", "uls-no-results-found": "कुनै पनि नतिजाहरू भेटिएन", - "uls-common-languages": "साझा भाषा", + "uls-common-languages": "सुझाव दिइएका भाषाहरू", "uls-no-results-suggestion-title": "तपाईंलाई यसमा चाख लाग्नसक्छ:", - "uls-search-help": "तपाईं भाषाको नाम, लिपीको नाम, आइएसओ कोड वा क्षेत्रको आधारमा खोज्न सक्नुहुन्छ:", - "uls-search-placeholder": "भाषा खोज्नुहोस" + "uls-search-help": "तपाईं भाषाको नाम, लिपीको नाम, आइएसओ कोड वा क्षेत्रको आधारमा खोज्न सक्नुहुन्छ या क्षेत्रको आधारमा अन्वेषण गर्न सक्नुहुन्छ:", + "uls-search-placeholder": "भाषा खोज्नुहोस्" } From c17d0417ae3219f7dc85d5c6434ccd397a478f52 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 18 Sep 2017 13:25:20 +0200 Subject: [PATCH 4/6] Localisation updates from https://translatewiki.net. --- i18n/kab.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/i18n/kab.json b/i18n/kab.json index e1aa9d9..fd2907d 100644 --- a/i18n/kab.json +++ b/i18n/kab.json @@ -5,7 +5,8 @@ "Mmistmurt", "Mezgoug", "Belkacem77", - "SlimaneAmiri" + "SlimaneAmiri", + "Sayem AtVkm" ] }, "uls-region-WW": "Deg umaḍal meṛṛa", @@ -20,6 +21,6 @@ "uls-no-results-found": "Ulac d acu i d-yufa.", "uls-common-languages": "Tutlayin yettusumren", "uls-no-results-suggestion-title": "Ma tebɣiḍ ad tisineḍ ayen nniḍen ɣef :", - "uls-search-help": "Tzemreḍ ad tnadiḍ s yisem n tutlayt, s uskript, s tengalt ISO n tutlayt neγ inig s tmnaḍt.", - "uls-search-placeholder": "Anadi γef tutlayt" + "uls-search-help": "Tzemreḍ ad tnadiḍ s yisem n tutlayt, s uskript, s tengalt ISO n tutlayt neγ inig s temnaḍt.", + "uls-search-placeholder": "Nadi γef tutlayt" } From 082ba26c47cce7e218c24dd20bf1f7bba1508f6a Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 21 Sep 2017 09:27:23 +0200 Subject: [PATCH 5/6] Localisation updates from https://translatewiki.net. --- i18n/hoc.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 i18n/hoc.json diff --git a/i18n/hoc.json b/i18n/hoc.json new file mode 100644 index 0000000..db58388 --- /dev/null +++ b/i18n/hoc.json @@ -0,0 +1,16 @@ +{ + "@metadata": { + "authors": [ + "Singkiring57" + ] + }, + "uls-region-WW": "𑢫𑣉𑣒𑣁 𑣉𑣕𑣈 𑣜𑣈", + "uls-region-SP": "𑢨𑣓𑣈𑣕𑣁𑣊", + "uls-region-AM": "𑢡𑣖𑣈𑣜𑣂𑣌𑣁", + "uls-region-AF": "𑢡𑣘𑣗𑣜𑣂𑣌𑣁", + "uls-region-EU": "𑢥𑣃𑣜𑣉𑣉𑣘", + "uls-region-AS": "𑢨𑣈𑣞𑣂𑣅𑣁", + "uls-region-all": "𑢾𑣗𑣈𑣓 𑣎𑣈𑣋𑣁𑣜 𑣌𑣉", + "uls-no-results-found": "𑢮𑣁𑣓𑣄 𑣌𑣁 𑣓𑣖 𑣎𑣓𑣁", + "uls-search-placeholder": "𑢶𑣂𑣈𑣑 𑣎𑣈𑣋𑣁𑣓 𑣓𑣈𑣚-𑣓𑣖𑣈" +} From 2bcbd17e1cfcd8053ae3903f0b8aeea825feeb7b Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 5 Oct 2017 07:53:45 +0200 Subject: [PATCH 6/6] Localisation updates from https://translatewiki.net. --- i18n/ur.json | 1 + 1 file changed, 1 insertion(+) diff --git a/i18n/ur.json b/i18n/ur.json index 16b6b42..49e7fba 100644 --- a/i18n/ur.json +++ b/i18n/ur.json @@ -13,6 +13,7 @@ "uls-region-AS": "ایشیا", "uls-region-ME": "مشرق وسطی", "uls-region-PA": "بحر الکاہل", + "uls-region-all": "تمام زبانیں", "uls-no-results-found": "مطلوبہ نتائج نہیں ملے", "uls-common-languages": "تجویز کردہ زبانیں", "uls-no-results-suggestion-title": "شاید آپ ان میں دلچسپی لیں:",