Jason.ji has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/246394

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
1 file changed, 25 insertions(+), 14 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VikiSemanticTitle 
refs/changes/94/246394/1

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(/&lt;/g, '<')
-                                                                               
         .replace(/&gt;/g, '>')
-                                                                               
         .replace(/&quot;/g, '"')
-                                                                               
         .replace(/&#039;/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(/&amp;/g, '&')
+                                                                               
                 .replace(/&lt;/g, '<')
+                                                                               
                 .replace(/&gt;/g, '>')
+                                                                               
                 .replace(/&quot;/g, '"')
+                                                                               
                 .replace(/&#039;/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 || "";
                }
        };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/246394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae2f20f3fcd396ce4e88a6c696e2b3b70b1efa78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VikiSemanticTitle
Gerrit-Branch: master
Gerrit-Owner: Jason.ji <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to