jenkins-bot has submitted this change and it was merged.
Change subject: Refactored getSection into Revision class and added tests
......................................................................
Refactored getSection into Revision class and added tests
Change-Id: I6c6fa5194482c25aa3f2285aebfee11cd713285d
---
M modules/ext.RevisionSlider.Revision.js
M modules/ext.RevisionSlider.init.js
M tests/RevisionSlider.Revision.test.js
M tests/RevisionSlider.test.js
4 files changed, 36 insertions(+), 16 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.RevisionSlider.Revision.js
b/modules/ext.RevisionSlider.Revision.js
index b8202a8..6152c9e 100644
--- a/modules/ext.RevisionSlider.Revision.js
+++ b/modules/ext.RevisionSlider.Revision.js
@@ -46,6 +46,20 @@
return this.comment;
},
+ getSection: function () {
+ var comment = this.getComment();
+ comment = comment.match(
+ new RegExp( '(/\\* [^\\*]* \\*/)', 'gi' )
+ );
+ if ( !comment ) {
+ return '';
+ }
+ return comment[ 0 ].replace(
+ new RegExp( ' \\*/|/\\* ', 'gi' ),
+ ''
+ );
+ },
+
formatDate: function ( rawDate ) {
var MONTHS = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May',
'June', 'July', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec' ],
f = new Date( rawDate ),
diff --git a/modules/ext.RevisionSlider.init.js
b/modules/ext.RevisionSlider.init.js
index d398f81..9011852 100755
--- a/modules/ext.RevisionSlider.init.js
+++ b/modules/ext.RevisionSlider.init.js
@@ -16,19 +16,6 @@
// location.href = $url;
// }
- function getSection( text ) {
- text = text.match(
- new RegExp( '(/\\* [^\\*]* \\*/)', 'gi' )
- );
- if ( !text ) {
- return '';
- }
- return text[ 0 ].replace(
- new RegExp( ' \\*/|/\\* ', 'ig' ),
- ''
- );
- }
-
function getComposedRevData( revs ) {
var max = 0,
changeSize = 0,
@@ -40,7 +27,7 @@
for ( i = 1; i < revs.length; i++ ) {
changeSize = Math.abs( revs[ i ].getSize() - revs[ i -
1 ].getSize() );
- section = getSection( revs[ i ].getComment() );
+ section = revs[ i ].getSection();
if ( changeSize > max ) {
max = changeSize;
}
@@ -74,7 +61,7 @@
for ( i = 1; i < revs.length; i++ ) {
diffSize = revs[ i ].getSize() - revs[ i - 1
].getSize();
relativeChangeSize = Math.ceil( 65.0 * Math.log(
Math.abs( diffSize ) ) / maxChangeSizeLogged ) + 5;
- section = getSection( revs[ i ].getComment() );
+ section = revs[ i ].getSection();
html = '<b>' + revs[ i ].getFormattedDate() +
'</b><br>';
html += mw.html.escape( revs[ i ].getUser() ) + '<br>';
diff --git a/tests/RevisionSlider.Revision.test.js
b/tests/RevisionSlider.Revision.test.js
index 45b09fb..df2063e 100644
--- a/tests/RevisionSlider.Revision.test.js
+++ b/tests/RevisionSlider.Revision.test.js
@@ -18,4 +18,23 @@
assert.equal( rev.getUser(), data.user );
} );
+ QUnit.test( 'get Revision with section', function ( assert ) {
+ var data = {
+ comment: '/* section */ comment',
+ parsedcomment: '<b>hello</b>'
+ },
+ rev = new mw.libs.revisionSlider.Revision( data );
+
+ assert.equal( rev.getSection(), 'section' );
+ } );
+
+ QUnit.test( 'get Revision without section', function ( assert ) {
+ var data = {
+ comment: 'no section comment'
+ },
+ rev = new mw.libs.revisionSlider.Revision( data );
+
+ assert.equal( rev.getSection(), '' );
+ } );
+
})( mediaWiki, jQuery );
diff --git a/tests/RevisionSlider.test.js b/tests/RevisionSlider.test.js
index 34dcf99..336d3dd 100755
--- a/tests/RevisionSlider.test.js
+++ b/tests/RevisionSlider.test.js
@@ -1,5 +1,5 @@
( function ( mw, $ ) {
- QUnit.module( 'ext.revisionSlider' );
+ QUnit.module( 'ext.RevisionSlider' );
/**
* Write your QUnit tests here. For more information on
--
To view, visit https://gerrit.wikimedia.org/r/286423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c6fa5194482c25aa3f2285aebfee11cd713285d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
