pkp#4575 Remove label behind autocomplete input

asmecher · May 9, 2019 · 879cb39 · 879cb39
1 parent 756bb61
commit 879cb39
Show file tree

Hide file tree

Showing 28 changed files with 1 addition and 66 deletions.
diff --git a/js/controllers/AutocompleteHandler.js b/js/controllers/AutocompleteHandler.js
@@ -32,9 +32,6 @@
 		this.sourceUrl_ = options.sourceUrl;
 		options.sourceUrl = undefined;
 
-		// Get the label passed in
-		this.jLabelText_ = options.jLabelText;
-
 		this.disableSync_ = options.disableSync;
 
 		// Create autocomplete settings.
@@ -55,16 +52,6 @@
 		// Create the autocomplete field with the jqueryUI plug-in.
 		this.textInput.autocomplete(autocompleteOptions);
 
-		// Assign our title text to our label. We assign and then
-		// clear or else the title value is displayed as the validation
-		// message.
-		this.textInput.attr('title', this.jLabelText_);
-		$('#' + this.textInput.attr('id')).jLabel();
-		this.textInput.attr('title', '');
-
-		// Get the new label inside of this Div.
-		this.textLabel_ = $autocompleteField.find('label');
-
 		// Get the text input inside of this Div.
 		this.hiddenInput_ = $autocompleteField.find('input:hidden');
 
@@ -79,22 +66,6 @@
 	//
 	// Private static properties
 	//
-	/**
-	 * The label inside the autocomplete div that is created by jLabel.
-	 * @private
-	 * @type {HTMLElement}
-	 */
-	$.pkp.controllers.AutocompleteHandler.textLabel_ = null;
-
-
-	/**
-	 * The label to be included as the default term for jLabel.
-	 * @private
-	 * @type {HTMLElement}
-	 */
-	$.pkp.controllers.AutocompleteHandler.jLabelText_ = null;
-
-
 	/**
 	 * Whether or not to disable syncing the text and hidden field.
 	 * @private
@@ -160,11 +131,10 @@
 	 */
 	$.pkp.controllers.AutocompleteHandler.prototype.itemSelected =
 			function(autocompleteElement, event, ui) {
-		var $hiddenInput, $textInput, $textLabel;
+		var $hiddenInput, $textInput;
 
 		$hiddenInput = this.hiddenInput_;
 		$textInput = this.textInput;
-		$textLabel = this.textLabel_;
 
 		// only update the text field if the item has a value
 		// this allows us to return a 'no items' label with
@@ -173,8 +143,6 @@
 		if (ui.item.value !== '') {
 			$hiddenInput.val(ui.item.value);
 			$textInput.val(ui.item.label);
-			// Let jLabel know that we have set a value.
-			$textInput.trigger('keyup');
 		}
 		return false;
 	};

diff --git a/js/lib/jquery/plugins/jquery.jlabel-1.3.min.js b/js/lib/jquery/plugins/jquery.jlabel-1.3.min.js
diff --git a/locale/ar_IQ/common.xml b/locale/ar_IQ/common.xml
@@ -250,7 +250,6 @@
 	<message key="common.size">الحجم</message>
 	<message key="common.source">المصدر</message>
 	<message key="common.status">الحالة</message>
-	<message key="common.startTyping">إبدأ بالكتابة</message>
 	<message key="common.subject">الموضوع</message>
 	<message key="common.subjects">الموضوعات</message>
 	<message key="common.subtitle">العنوان الفرعي</message>

diff --git a/locale/ca_ES/common.xml b/locale/ca_ES/common.xml
@@ -207,7 +207,6 @@
 	<message key="common.size">Mida</message>
 	<message key="common.source">Font</message>
 	<message key="common.status">Estat</message>
-	<message key="common.startTyping">Comenceu a escriure</message>
 	<message key="common.subject">Matèria</message>
 	<message key="common.subjects">Temes</message>
 	<message key="common.subtitle">Subtítol</message>

diff --git a/locale/cs_CZ/common.xml b/locale/cs_CZ/common.xml
@@ -366,7 +366,6 @@
 	<message key="common.reset">Resetovat</message>
 	<message key="common.searchQuery">Vyhledávací dotaz</message>
 	<message key="common.sendEmail">Poslat email</message>
-	<message key="common.startTyping">Začněte psát</message>
 	<message key="common.subjects">Předměty</message>
 	<message key="common.subtitle">Podtitul</message>
 	<message key="common.notes.tooltip">Poznámky (žluté: nové poznámky; modré: přečtené poznámky; šedé: poznámky nejsou)</message>

diff --git a/locale/da_DK/common.xml b/locale/da_DK/common.xml
@@ -443,7 +443,6 @@
 	<message key="common.reminded.date">Påmindet: {$dateReminded}</message>
 	<message key="common.searchQuery">Søgeforespørgsel</message>
 	<message key="common.sendEmail">Sendt e-mail</message>
-	<message key="common.startTyping">Begynd indtastning</message>
 	<message key="common.subjects">Emner</message>
 	<message key="common.component">Dele</message>
 	<message key="common.metric">Mål</message>

diff --git a/locale/de_DE/common.xml b/locale/de_DE/common.xml
@@ -251,7 +251,6 @@
 	<message key="common.size">Größe</message>
 	<message key="common.source">Quelle</message>
 	<message key="common.status">Status</message>
-	<message key="common.startTyping">Eingabe beginnen</message>
 	<message key="common.subject">Thema</message>
 	<message key="common.subjects">Themen</message>
 	<message key="common.subtitle">Untertitel</message>

diff --git a/locale/en_US/common.xml b/locale/en_US/common.xml
@@ -258,7 +258,6 @@
 	<message key="common.size">Size</message>
 	<message key="common.source">Source</message>
 	<message key="common.status">Status</message>
-	<message key="common.startTyping">Start Typing</message>
 	<message key="common.subject">Subject</message>
 	<message key="common.subjects">Subjects</message>
 	<message key="common.subtitle">Subtitle</message>

diff --git a/locale/es_ES/common.xml b/locale/es_ES/common.xml
@@ -204,7 +204,6 @@
 	<message key="common.size">Tamaño</message>
 	<message key="common.source">Fuente</message>
 	<message key="common.status">Estado</message>
-	<message key="common.startTyping">Empezar a escribir</message>
 	<message key="common.subject">Materia</message>
 	<message key="common.subjects">Asuntos</message>
 	<message key="common.subtitle">Subtítulo</message>

diff --git a/locale/fa_IR/common.xml b/locale/fa_IR/common.xml
@@ -227,7 +227,6 @@
 	<message key="common.size">اندازه</message>
 	<message key="common.source">منبع</message>
 	<message key="common.status">وضعیت</message>
-	<message key="common.startTyping">در حال تایپ</message>
 	<message key="common.subject">موضوع</message>
 	<message key="common.subjects">موضوعات</message>
 	<message key="common.subtitle">زیر عنوان</message>

diff --git a/locale/fi_FI/common.xml b/locale/fi_FI/common.xml
@@ -229,7 +229,6 @@
 	<message key="common.size">Koko</message>
 	<message key="common.source">Lähde</message>
 	<message key="common.status">Tila</message>
-	<message key="common.startTyping">Aloita kirjoittaminen</message>
 	<message key="common.subject">Aihe</message>
 	<message key="common.subjects">Aiheet</message>
 	<message key="common.subtitle">Alaotsikko</message>

diff --git a/locale/fr_CA/common.xml b/locale/fr_CA/common.xml
@@ -444,7 +444,6 @@
 	<message key="common.reset">Réinitialiser</message>
 	<message key="common.sendEmail">Envoyer le courriel</message>
 	<message key="common.signoff">Approuver</message>
-	<message key="common.startTyping">Commencer à écrire</message>
 	<message key="common.subjects">Sujets</message>
 	<message key="common.subtitle">Sous-titre</message>
 	<message key="common.element">Élément</message>

diff --git a/locale/fr_FR/common.xml b/locale/fr_FR/common.xml
@@ -446,7 +446,6 @@
 	<message key="common.reset">Réinitialiser</message>
 	<message key="common.sendEmail">Envoyer le courriel</message>
 	<message key="common.signoff">Approuver</message>
-	<message key="common.startTyping">Commencer à écrire</message>
 	<message key="common.subjects">Sujets</message>
 	<message key="common.subtitle">Sous-titre</message>
 	<message key="common.element">Élément</message>

diff --git a/locale/it_IT/common.xml b/locale/it_IT/common.xml
@@ -417,7 +417,6 @@
 	<message key="common.reminded.date">Data invio promemoria: {$dateReminded}</message>
 	<message key="common.saving">Salvando</message>
 	<message key="common.searchQuery">Stringa di ricerca</message>
-	<message key="common.startTyping">Inizia a scrivere</message>
 	<message key="common.subjects">Soggetti</message>
 	<message key="common.component">Componente</message>
 	<message key="common.homepageImage.altText">Immagine della homepage</message>

diff --git a/locale/nl_NL/common.xml b/locale/nl_NL/common.xml
@@ -248,7 +248,6 @@
 	<message key="common.size">Grootte</message>
 	<message key="common.source">Bron</message>
 	<message key="common.status">Status</message>
-	<message key="common.startTyping">Begin te typen</message>
 	<message key="common.subject">Onderwerp</message>
 	<message key="common.subjects">Onderwerpen</message>
 	<message key="common.subtitle">Ondertitel</message>

diff --git a/locale/pl_PL/common.xml b/locale/pl_PL/common.xml
@@ -406,7 +406,6 @@
 	<message key="common.reminded.date">Powiadomiony: {$dateReminded}</message>
 	<message key="common.searchQuery">Zapytanie</message>
 	<message key="common.sendEmail">Wyślij e-mail</message>
-	<message key="common.startTyping">Zacznij pisać</message>
 	<message key="common.subjects">Przedmioty</message>
 	<message key="common.subtitle">Podtytuł</message>
 	<message key="common.component">Element</message>

diff --git a/locale/pt_BR/common.xml b/locale/pt_BR/common.xml
@@ -235,7 +235,6 @@
 	<message key="common.size">Tamanho</message>
 	<message key="common.source">Fonte</message>
 	<message key="common.status">Situação</message>
-	<message key="common.startTyping">Iniciar digitação</message>
 	<message key="common.subject">Assunto</message>
 	<message key="common.subjects">Assuntos</message>
 	<message key="common.subtitle">Subtítulo</message>

diff --git a/locale/pt_PT/common.xml b/locale/pt_PT/common.xml
@@ -355,7 +355,6 @@
 	<message key="common.remoteURL">URL remoto</message>
 	<message key="common.reset">Restaurar</message>
 	<message key="common.sendEmail">Enviar E-mail</message>
-	<message key="common.startTyping">Começar a Escrever</message>
 	<message key="common.subjects">Assuntos</message>
 	<message key="common.subtitle">Subtítulo</message>
 	<message key="common.component">Componente</message>

diff --git a/locale/ru_RU/common.xml b/locale/ru_RU/common.xml
@@ -253,7 +253,6 @@
 	<message key="common.size">Размер</message>
 	<message key="common.source">Источник</message>
 	<message key="common.status">Статус</message>
-	<message key="common.startTyping">Начать вводить с клавиатуры</message>
 	<message key="common.subject">Тема</message>
 	<message key="common.subjects">Темы</message>
 	<message key="common.subtitle">Подзаголовок</message>

diff --git a/locale/sl_SI/common.xml b/locale/sl_SI/common.xml
@@ -244,7 +244,6 @@
 	<message key="common.size">Velikost</message>
 	<message key="common.source">Vir</message>
 	<message key="common.status">Status</message>
-	<message key="common.startTyping">Začetek vnosa</message>
 	<message key="common.subject">Zadeva</message>
 	<message key="common.subjects">Predmet</message>
 	<message key="common.subtitle">Podnaslov</message>

diff --git a/locale/sr_RS@cyrillic/common.xml b/locale/sr_RS@cyrillic/common.xml
@@ -380,7 +380,6 @@
 	<message key="common.reminded.date">Подсећен: {$dateReminded}</message>
 	<message key="common.searchQuery">Упит за претрагу</message>
 	<message key="common.sendEmail">Пошаљи имејл</message>
-	<message key="common.startTyping">Започни са писањем</message>
 	<message key="common.subjects">Субјекти</message>
 	<message key="common.subtitle">Поднаслов</message>
 	<message key="common.component">Компонента</message>

diff --git a/locale/sr_RS@latin/common.xml b/locale/sr_RS@latin/common.xml
@@ -388,7 +388,6 @@
 	<message key="common.reminded.date">Podsećen: {$dateReminded}</message>
 	<message key="common.searchQuery">Upit za pretragu</message>
 	<message key="common.sendEmail">Pošalji imejl</message>
-	<message key="common.startTyping">Započni sa pisanjem</message>
 	<message key="common.subjects">Subjekti</message>
 	<message key="common.subtitle">Podnaslov</message>
 	<message key="common.component">Komponenta</message>

diff --git a/locale/sv_SE/common.xml b/locale/sv_SE/common.xml
@@ -251,7 +251,6 @@
 	<message key="common.size">Storlek</message>
 	<message key="common.source">Källa</message>
 	<message key="common.status">Status</message>
-	<message key="common.startTyping">Börja skriva</message>
 	<message key="common.subject">Ämne</message>
 	<message key="common.subjects">Ämnen</message>
 	<message key="common.subtitle">Undertitel</message>

diff --git a/locale/tr_TR/common.xml b/locale/tr_TR/common.xml
@@ -442,7 +442,6 @@
 	<message key="common.clearSearch">Arama ifadesini temizle</message>
 	<message key="common.sendEmail">Email gönder</message>
 	<message key="common.range">{$min}-{$max}</message>
-	<message key="common.startTyping">Yazmaya Başla</message>
 	<message key="common.subjects">Konular</message>
 	<message key="common.subtitle">Alt Başlık</message>
 	<message key="common.component">Bileşen</message>

diff --git a/locale/uk_UA/common.xml b/locale/uk_UA/common.xml
@@ -251,7 +251,6 @@
 	<message key="common.size">Розмір</message>
 	<message key="common.source">Джерело</message>
 	<message key="common.status">Статус</message>
-	<message key="common.startTyping">Почати писати</message>
 	<message key="common.subject">Тема</message>
 	<message key="common.subjects">Теми</message>
 	<message key="common.subtitle">Підзаголовок</message>

diff --git a/styles/index.less b/styles/index.less
@@ -33,9 +33,6 @@
 // Controllers
 @import "lib/pkp/styles/controllers/index.less";
 
-// Override styles from imported libraries
-@import "lib/pkp/styles/jlabel.less";
-
 // Link Actions
 @import "lib/pkp/styles/linkActions.less";
 

diff --git a/styles/jlabel.less b/styles/jlabel.less
diff --git a/templates/form/autocompleteInput.tpl b/templates/form/autocompleteInput.tpl
@@ -7,14 +7,12 @@
  *
  * an autocomplete input
  *}
-{capture assign="jLabelText"}{translate key="common.startTyping"}{/capture}
 <script>
 	$(function() {ldelim}
 		$('#{$FBV_id}_container').pkpHandler('$.pkp.controllers.AutocompleteHandler',
 			{ldelim}
 				{if $FBV_disableSync}disableSync: true,{/if}
 				sourceUrl: {$FBV_autocompleteUrl|json_encode},
-				jLabelText: {$jLabelText|json_encode}
 			{rdelim});
 	{rdelim});
 </script>