Kipcool has submitted this change and it was merged.
Change subject: suggest.js + omegawiki-addExtAPI.js a bit of rewriting.
......................................................................
suggest.js + omegawiki-addExtAPI.js
a bit of rewriting.
Change-Id: I2b4951cbc5f5995a8350e57de3935859ea3d0c72
---
M resources/omegawiki-addExtAPI.js
M resources/suggest.js
2 files changed, 17 insertions(+), 13 deletions(-)
Approvals:
Kipcool: Verified; Looks good to me, approved
diff --git a/resources/omegawiki-addExtAPI.js b/resources/omegawiki-addExtAPI.js
index fdeedbe..c0bff3f 100644
--- a/resources/omegawiki-addExtAPI.js
+++ b/resources/omegawiki-addExtAPI.js
@@ -211,7 +211,7 @@
if ( ctr + '.' ===
ctrChoice ) {
if(
rw.relationshipType === 'synonym' ) {
//
console.log( rw['words'] );
-
addExtHtml += getExtSynonym( rw['words'], dmId, langId, definition.src );
+
addExtHtml += getExtSynonym( rw.words, dmId, langId, definition.src );
}
}
});
@@ -224,7 +224,7 @@
$('#ext_def').slideUp();
$('#inputSelectButton').attr( 'value', 'submit'
);
$('#inputSkipSelectButton').attr( 'value',
'skip' );
- var addExtHtml = '<table><tr>' + addExtHtml +
'</tr></table>';
+ addExtHtml = '<table><tr>' + addExtHtml +
'</tr></table>';
$('#ext_def').html( addExtHtml );
$('#ext_def').slideDown();
} else {
diff --git a/resources/suggest.js b/resources/suggest.js
index 55b7c65..165d6bd 100644
--- a/resources/suggest.js
+++ b/resources/suggest.js
@@ -89,8 +89,9 @@
* and buttons next, previous and clear
*/
function createSuggestStructure( element, suggestPrefix ) {
- var imgPath = mw.config.get( 'wgExtensionAssetsPath' ) +
'/WikiLexicalData/Images/',
- suggestStructure =
+ var imgPath, suggestStructure;
+ imgPath = mw.config.get( 'wgExtensionAssetsPath' ) +
'/WikiLexicalData/Images/';
+ suggestStructure =
'<div class="suggest-drop-down"><div id="' +
suggestPrefix + 'div" class="suggest-div">' +
'<table><tr>' +
'<td><input type="text" id="' +
suggestPrefix + 'text" autocomplete="off" class="suggest-text"/></td>' +
@@ -247,8 +248,9 @@
}
function updateSelectOptions(id, objectId, value) {
- var URL = 'index.php',
- location = "" + document.location;
+ var URL, location;
+ URL = 'index.php';
+ location = "" + document.location;
if (location.indexOf('index.php/') > 0) {
URL = '../' + URL;
@@ -284,13 +286,15 @@
});
$(".suggestion-row").click(function() {
- var suggestPrefix = stripSuffix(
$(this).closest('.suggest-div').attr('id'), 'div' ),
- suggestlink = '#' + suggestPrefix + 'link',
- idColumnsField =
$(suggestlink).attr('id-columns' ),
- displayLabelField =
$(suggestlink).attr('label-columns' ),
- displayLabelColumnIndices =
displayLabelField.split(", " ),
- labels = [],
- i, columnValue, idColumns, values, ids;
+ var suggestPrefix, suggestlink, idColumnsField,
displayLabelField, displayLabelColumnIndices, labels, i, columnValue,
idColumns, values, ids;
+
+ // suggestPrefix is something like
add-dm-1370660-def-transl-language-suggest-
+ suggestPrefix = stripSuffix(
$(this).closest('.suggest-div').attr('id'), 'div' );
+ suggestlink = '#' + suggestPrefix + 'link';
+ idColumnsField = $(suggestlink).attr('id-columns' );
+ displayLabelField = $(suggestlink).attr('label-columns'
);
+ displayLabelColumnIndices = displayLabelField.split(",
" );
+ labels = [];
for ( i = 0; i < displayLabelColumnIndices.length; i++)
{
columnValue =
this.getElementsByTagName('td')[displayLabelColumnIndices[i]].innerHTML;
--
To view, visit https://gerrit.wikimedia.org/r/250059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b4951cbc5f5995a8350e57de3935859ea3d0c72
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Kipcool <[email protected]>
Gerrit-Reviewer: Kipcool <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
