Jason.ji has submitted this change and it was merged.
Change subject: Detects if DISPLAYTITLE was set to a display:none tag, and
ignores it if so.
......................................................................
Detects if DISPLAYTITLE was set to a display:none tag, and ignores it if so.
Change-Id: Iae2f20f3fcd396ce4e88a6c696e2b3b70b1efa78
---
M VikiSemanticTitle.js
M VikiSemanticTitle.php
2 files changed, 26 insertions(+), 15 deletions(-)
Approvals:
Jason.ji: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/VikiSemanticTitle.js b/VikiSemanticTitle.js
index dc6f5bf..fb00e38 100644
--- a/VikiSemanticTitle.js
+++ b/VikiSemanticTitle.js
@@ -97,26 +97,37 @@
data = data.query.pages[ Object.keys( data.query.pages
)[ 0 ] ];
if(data.pageprops && data.pageprops.displaytitle) {
var semanticTitle = data.pageprops.displaytitle;
- semanticTitle = semanticTitle.replace(/&/g,
'&')
-
.replace(/</g, '<')
-
.replace(/>/g, '>')
-
.replace(/"/g, '"')
-
.replace(/'/g, '\'');
- if ( node.semanticTitle !== semanticTitle ) {
-
- node.displayName = semanticTitle.length
< 20 ? semanticTitle : semanticTitle.substring( 0, 20 ) + "...";
- node.fullDisplayName = semanticTitle +
" (" + node.pageTitle + ")";
+ semanticTitleStripped =
this.stripTags(semanticTitle).trim();
+ if(semanticTitleStripped.length == 0) {
+ vikiObject.hookCompletion( my.hookName
);
}
- node.semanticQueried = true;
+ else {
+ semanticTitle =
semanticTitle.replace(/&/g, '&')
+
.replace(/</g, '<')
+
.replace(/>/g, '>')
+
.replace(/"/g, '"')
+
.replace(/'/g, '\'');
+ if ( node.semanticTitle !==
semanticTitle ) {
- vikiObject.hookCompletion( my.hookName, {
- "redrawNode": true,
- "node": node
- } );
+ node.displayName =
semanticTitle.length < 20 ? semanticTitle : semanticTitle.substring( 0, 20 ) +
"...";
+ node.fullDisplayName =
semanticTitle + " (" + node.pageTitle + ")";
+ }
+ node.semanticQueried = true;
+
+ vikiObject.hookCompletion( my.hookName,
{
+ "redrawNode": true,
+ "node": node
+ } );
+ }
}
else {
vikiObject.hookCompletion( my.hookName );
}
+ },
+ stripTags: function(html) {
+ var tmp = document.createElement("DIV");
+ tmp.innerHTML = html;
+ return tmp.textContent || tmp.innerText || "";
}
};
diff --git a/VikiSemanticTitle.php b/VikiSemanticTitle.php
index de8215a..cc1dae7 100644
--- a/VikiSemanticTitle.php
+++ b/VikiSemanticTitle.php
@@ -54,7 +54,7 @@
$wgExtensionCredits['parserhook'][] = array (
'name' => 'VikiSemanticTitle',
- 'version' => '1.2',
+ 'version' => '1.2.1',
'author' => '[http://www.mediawiki.org/wiki/User:Jji Jason Ji]',
'descriptionmsg' => 'vikisemantictitle-desc',
'path' => __FILE__,
--
To view, visit https://gerrit.wikimedia.org/r/246394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae2f20f3fcd396ce4e88a6c696e2b3b70b1efa78
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VikiSemanticTitle
Gerrit-Branch: master
Gerrit-Owner: Jason.ji <[email protected]>
Gerrit-Reviewer: Jason.ji <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
