[MediaWiki-commits] [Gerrit] Use exchars instead of exsentences for the extract - change (mediawiki...Popups)

2016-05-26 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Use exchars instead of exsentences for the extract
..


Use exchars instead of exsentences for the extract

To avoid sentence parsing bugs in other languages.

We have to artificially remove the always-added ellipsis from textextracts to
mimic previous behavior, and we'll add ellipsis via CSS afterwards.

Bug: T135824
Change-Id: Idf27f2fd18f7197e588c609eeb62ac8fc80626d7
---
M resources/ext.popups.renderer.article.js
1 file changed, 16 insertions(+), 1 deletion(-)

Approvals:
  Phuedx: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/ext.popups.renderer.article.js 
b/resources/ext.popups.renderer.article.js
index 14ec6e9..ac8363a 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -9,6 +9,12 @@
$window = $( window );
 
/**
+* Number of chars to request for the article extract
+* @property CHARS
+*/
+   article.CHARS = 525;
+
+   /**
 * Size constants for popup images
 * @property SIZES
 */
@@ -55,7 +61,7 @@
formatversion: 2,
redirects: true,
exintro: true,
-   exsentences: 5,
+   exchars: article.CHARS,
// there is an added geometric limit on 
.mwe-popups-extract
// so that text does not overflow from the card
explaintext: true,
@@ -99,6 +105,8 @@
deferred.reject();
return;
}
+
+   re.query.pages[ 0 ].extract = removeEllipsis( 
re.query.pages[ 0 ].extract );
 
mw.popups.render.cache[ href ] = {};
mw.popups.render.cache[ href ].popup = 
article.createPopup( re.query.pages[ 0 ], href );
@@ -667,4 +675,11 @@
 */
mw.popups.render.getClosestYPosition = getClosestYPosition;
 
+   /**
+* Remove ellipsis if exists at the end
+*/
+   function removeEllipsis( text ) {
+   return text.replace( /\.\.\.$/, '' );
+   }
+
 } )( jQuery, mediaWiki );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf27f2fd18f7197e588c609eeb62ac8fc80626d7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Jhobs 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Use exchars instead of exsentences for the extract - change (mediawiki...Popups)

2016-05-26 Thread Jhernandez (Code Review)
Jhernandez has uploaded a new change for review.

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

Change subject: Use exchars instead of exsentences for the extract
..

Use exchars instead of exsentences for the extract

To avoid sentence parsing bugs in other languages.

Bug: T135824
Change-Id: Idf27f2fd18f7197e588c609eeb62ac8fc80626d7
---
M resources/ext.popups.renderer.article.js
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/13/290913/1

diff --git a/resources/ext.popups.renderer.article.js 
b/resources/ext.popups.renderer.article.js
index 14ec6e9..aee0985 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -6,7 +6,8 @@
 * @singleton
 */
var article = {},
-   $window = $( window );
+   $window = $( window ),
+   CHARS = 525;
 
/**
 * Size constants for popup images
@@ -55,7 +56,7 @@
formatversion: 2,
redirects: true,
exintro: true,
-   exsentences: 5,
+   exchars: CHARS,
// there is an added geometric limit on 
.mwe-popups-extract
// so that text does not overflow from the card
explaintext: true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf27f2fd18f7197e588c609eeb62ac8fc80626d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits