Sophivorus has submitted this change and it was merged.
Change subject: Support for aliases
......................................................................
Support for aliases
Also improved display in List mode
Change-Id: Ic9eed2fb4847893670f068b16a3861517d16b79b
---
M proveit.css
M proveit.js
2 files changed, 34 insertions(+), 36 deletions(-)
Approvals:
Sophivorus: Verified; Looks good to me, approved
diff --git a/proveit.css b/proveit.css
index 8f5ea12..9dc76dd 100755
--- a/proveit.css
+++ b/proveit.css
@@ -78,7 +78,7 @@
font-weight: bold;
}
-#proveit-reference-list .proveit-reference-item .proveit-required-param-value {
+#proveit-reference-list .proveit-reference-item .proveit-param-value {
margin-left: 10px;
}
diff --git a/proveit.js b/proveit.js
index d3108e0..ad93917 100755
--- a/proveit.js
+++ b/proveit.js
@@ -30,7 +30,6 @@
'proveit-reference-name-label': 'Reference name',
'proveit-reference-content-label': 'Reference content',
'proveit-reference-template-label': 'Main template',
- 'proveit-params-button': 'Show all parameters',
'proveit-cite-button': 'Cite',
'proveit-remove-button': 'Remove',
'proveit-insert-button': 'Insert',
@@ -46,7 +45,6 @@
'proveit-reference-name-label': 'Nombre de la
referencia',
'proveit-reference-content-label': 'Contenido de la
referencia',
'proveit-reference-template-label': 'Plantilla
principal',
- 'proveit-params-button': 'Ver todos los parámetros',
'proveit-cite-button': 'Citar',
'proveit-remove-button': 'Borrar',
'proveit-insert-button': 'Insertar',
@@ -62,7 +60,6 @@
'proveit-reference-name-label': 'Имя сноски',
'proveit-reference-content-label': 'Содержание сноски',
'proveit-reference-template-label': 'Основной шаблон',
- 'proveit-params-button': 'Показать все параметры',
'proveit-cite-button': 'Цитировать',
'proveit-remove-button': 'Удалить',
'proveit-insert-button': 'Вставить',
@@ -541,19 +538,6 @@
this.params = {};
/**
- * Show all the hidden optional parameters
- *
- * @return {void}
- */
- this.showAllParams = function () {
- var button = $( this ),
- form = button.closest( 'form' ),
- rows = $( 'tr', form );
- rows.show();
- button.hide();
- };
-
- /**
* Insert a citation to this reference
*
* @return {void}
@@ -819,14 +803,38 @@
// Add the main content
if ( this.template ) {
- var templateSpan = $( '<span>' ).addClass(
'proveit-reference-template' ).text( this.template ),
- requiredParams =
this.getRequiredParams(),
- requiredParamName, requiredParamValue,
requiredParamSpan;
+ // First add the template name
+ var templateSpan = $( '<span>' ).addClass(
'proveit-reference-template' ).text( this.template );
item.html( templateSpan );
- for ( requiredParamName in requiredParams ) {
- requiredParamValue = this.params[
requiredParamName ];
- requiredParamSpan = $( '<span>'
).addClass( 'proveit-required-param-value' ).text( requiredParamValue );
- item.append( requiredParamSpan );
+
+ // Search the values of the first three
parameters and add them to the list item
+ // We search for the first three values rather
than the required ones because
+ // some tempalates (like Template:Citation)
don't have any required parameters
+ // but we sort the parameters to give priority
to the required parameters
+ var sortedParams = this.getSortedParams(),
+ paramCount = 0, paramValue, paramData,
paramAlias, paramSpan;
+ for ( var paramName in sortedParams ) {
+ paramValue = '';
+ if ( paramName in this.params ) {
+ paramValue = this.params[
paramName ];
+ } else {
+ paramData = sortedParams[
paramName ];
+ for ( var i = 0; i <
paramData.aliases.length; i++ ) {
+ paramAlias =
paramData.aliases[ i ];
+ paramAlias = $.trim(
paramAlias );
+ if ( paramAlias in
this.params ) {
+ paramValue =
this.params[ paramAlias ];
+ }
+ }
+ }
+ if ( paramValue ) {
+ paramSpan = $( '<span>'
).addClass( 'proveit-param-value' ).text( paramValue );
+ item.append( paramSpan );
+ paramCount++;
+ if ( paramCount === 3 ) {
+ break;
+ }
+ }
}
} else {
item.text( this.content );
@@ -903,7 +911,6 @@
// Add the parameter fields
var sortedParams = this.getSortedParams(),
requiredParams = this.getRequiredParams(),
- optionalParams = this.getOptionalParams(),
paramData, paramLabel, paramPlaceholder,
paramDescription, paramAlias, paramValue, row, label, paramNameInput,
paramValueInput;
for ( var paramName in sortedParams ) {
@@ -935,6 +942,7 @@
paramDescription =
paramData.description[ proveit.userLanguage ];
}
+ // Extract the parameter value
if ( paramName in this.params ) {
paramValue = this.params[ paramName ];
} else {
@@ -958,18 +966,10 @@
row.addClass( 'proveit-required' );
}
- // Hide the optional parameters, unless they
are filled
- if ( ( paramName in optionalParams ) &&
!paramValue ) {
- row.hide();
- }
-
// Put it all together and add it to the table
row.append( label, paramValueInput,
paramNameInput );
table.append( row );
}
-
- // Show the params button
- $( '#proveit-params-button' ).show();
// Bind events
templateSelect.change( this, function ( event ) {
@@ -994,17 +994,15 @@
// Add the buttons
var buttons = $( '<div>' ).attr( 'id',
'proveit-buttons' ),
- paramsButton = $( '<button>' ).attr( 'id',
'proveit-params-button' ).text( proveit.getMessage( 'params-button' ) ),
citeButton = $( '<button>' ).attr( 'id',
'proveit-cite-button' ).text( proveit.getMessage( 'cite-button' ) ),
removeButton = $( '<button>' ).attr( 'id',
'proveit-remove-button' ).text( proveit.getMessage( 'remove-button' ) ),
updateButton = $( '<button>' ).attr( 'id',
'proveit-update-button' ).text( proveit.getMessage( 'update-button' ) ),
insertButton = $( '<button>' ).attr( 'id',
'proveit-insert-button' ).text( proveit.getMessage( 'insert-button' ) );
- buttons.append( paramsButton, citeButton, removeButton,
updateButton, insertButton );
+ buttons.append( citeButton, removeButton, updateButton,
insertButton );
form.append( table, buttons );
// Bind events
form.submit( false );
- paramsButton.click( this.showAllParams );
citeButton.click( this, this.cite );
removeButton.click( this, this.remove );
updateButton.click( this, this.update );
--
To view, visit https://gerrit.wikimedia.org/r/315875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9eed2fb4847893670f068b16a3861517d16b79b
Gerrit-PatchSet: 1
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus <scheno...@gmail.com>
Gerrit-Reviewer: Sophivorus <scheno...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
