[MediaWiki-commits] [Gerrit] Add size & minor flag to tooltip - change (mediawiki...RevisionSlider)
WMDE-leszek has submitted this change and it was merged.
Change subject: Add size & minor flag to tooltip
..
Add size & minor flag to tooltip
Bug: T135118
Change-Id: I2bc90a2f8a03693df092a4785cfe2fdfcc85730a
---
M extension.json
M modules/ext.RevisionSlider.Revision.js
M modules/ext.RevisionSlider.RevisionListView.js
M tests/RevisionSlider.Revision.test.js
4 files changed, 55 insertions(+), 1 deletion(-)
Approvals:
WMDE-leszek: Verified; Looks good to me, approved
diff --git a/extension.json b/extension.json
index 61f823a..a0e643d 100755
--- a/extension.json
+++ b/extension.json
@@ -91,6 +91,9 @@
"dependencies": [
"ext.RevisionSlider.Revision",
"ext.RevisionSlider.RevisionListView"
+ ],
+ "messages": [
+ "minoredit"
]
},
"ext.RevisionSlider.RevisionListView": {
diff --git a/modules/ext.RevisionSlider.Revision.js
b/modules/ext.RevisionSlider.Revision.js
index 7c2d53a..5912125 100644
--- a/modules/ext.RevisionSlider.Revision.js
+++ b/modules/ext.RevisionSlider.Revision.js
@@ -7,6 +7,7 @@
this.parsedComment = data.parsedcomment;
this.timestamp = data.timestamp;
this.user = data.user;
+ this.minor = data.hasOwnProperty( 'minor' ) && ( data.minor ||
data.minor === '' );
};
$.extend( Revision.prototype, {
@@ -24,6 +25,11 @@
* @type {string}
*/
comment: '',
+
+ /**
+* @type {boolean}
+*/
+ minor: false,
/**
* @type {string}
@@ -53,6 +59,10 @@
return this.size;
},
+ isMinor: function () {
+ return this.minor;
+ },
+
getParsedComment: function () {
return this.parsedComment;
},
diff --git a/modules/ext.RevisionSlider.RevisionListView.js
b/modules/ext.RevisionSlider.RevisionListView.js
index 0931358..dc2dcd0 100644
--- a/modules/ext.RevisionSlider.RevisionListView.js
+++ b/modules/ext.RevisionSlider.RevisionListView.js
@@ -48,7 +48,9 @@
var $tooltip = $( '' ) // TODO: center is
deprecated since 1995
.append( '' + rev.getFormattedDate() +
'' )
.append( $( '' ).text( mw.html.escape(
rev.getUser() ) ) )
- .append( rev.getComment() ? $( '' ).append(
'' ).text( mw.html.escape( rev.getComment() ) ) : '' );
+ .append( rev.getComment() ? $( '' ).append(
'' ).text( mw.html.escape( rev.getComment() ) ) : '' )
+ .append( $( '' ).html( rev.getSize() + '
bytes' ) )
+ .append( rev.isMinor() ? $( '' ).html(
mw.message( 'minoredit' ).text() ) : '' );
return $( '' ).append( $tooltip ).html();
}
diff --git a/tests/RevisionSlider.Revision.test.js
b/tests/RevisionSlider.Revision.test.js
index 68d1080..275b70a 100644
--- a/tests/RevisionSlider.Revision.test.js
+++ b/tests/RevisionSlider.Revision.test.js
@@ -16,6 +16,45 @@
assert.equal( rev.getParsedComment(), data.parsedcomment );
assert.equal( rev.getFormattedDate(), '10:27, 26 Apr 2016' );
assert.equal( rev.getUser(), data.user );
+ assert.equal( rev.isMinor(), false );
+ } );
+
+ QUnit.test( 'create minor Revision (minor empty string)', function (
assert ) {
+ var data = {
+ size: 5,
+ comment: 'hello',
+ parsedcomment: 'hello',
+ timestamp: '2016-04-26T10:27:14Z', // 10:27, 26
Apr 2016
+ user: 'meh',
+ minor: ''
+ },
+ rev = new mw.libs.revisionSlider.Revision( data );
+
+ assert.equal( rev.getSize(), data.size );
+ assert.equal( rev.getComment(), data.comment );
+ assert.equal( rev.getParsedComment(), data.parsedcomment );
+ assert.equal( rev.getFormattedDate(), '10:27, 26 Apr 2016' );
+ assert.equal( rev.getUser(), data.user );
+ assert.equal( rev.isMinor(), true );
+ } );
+
+ QUnit.test( 'create minor Revision (minor true, as if from another
Revision object)', function ( assert ) {
+ var data = {
+ size: 5,
+ comment: 'hello',
+ parsedcomment: 'hello',
+
[MediaWiki-commits] [Gerrit] Add size & minor flag to tooltip - change (mediawiki...RevisionSlider)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288374
Change subject: Add size & minor flag to tooltip
..
Add size & minor flag to tooltip
Bug: T135118
Change-Id: I2bc90a2f8a03693df092a4785cfe2fdfcc85730a
---
M modules/ext.RevisionSlider.Revision.js
M modules/ext.RevisionSlider.RevisionListView.js
M tests/RevisionSlider.Revision.test.js
3 files changed, 35 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/74/288374/1
diff --git a/modules/ext.RevisionSlider.Revision.js
b/modules/ext.RevisionSlider.Revision.js
index ef61abb..938a138 100644
--- a/modules/ext.RevisionSlider.Revision.js
+++ b/modules/ext.RevisionSlider.Revision.js
@@ -7,6 +7,9 @@
this.parsedComment = data.parsedcomment;
this.timestamp = data.timestamp;
this.user = data.user;
+ if ( data.minor ) {
+ this.minor = true;
+ }
};
$.extend( Revision.prototype, {
@@ -24,6 +27,11 @@
* @type {string}
*/
comment: '',
+
+ /**
+* @type {boolean}
+*/
+ minor: false,
/**
* @type {string}
@@ -48,6 +56,10 @@
return this.size;
},
+ getIsMinor: function () {
+ return this.minor;
+ },
+
getParsedComment: function () {
return this.parsedComment;
},
diff --git a/modules/ext.RevisionSlider.RevisionListView.js
b/modules/ext.RevisionSlider.RevisionListView.js
index 05a1bd1..23f17e9 100644
--- a/modules/ext.RevisionSlider.RevisionListView.js
+++ b/modules/ext.RevisionSlider.RevisionListView.js
@@ -48,7 +48,9 @@
var $tooltip = $( '' ) // TODO: center is
deprecated since 1995
.append( '' + rev.getFormattedDate() +
'' )
.append( $( '' ).text( mw.html.escape(
rev.getUser() ) ) )
- .append( rev.getComment() ? $( '' ).append(
'' ).text( mw.html.escape( rev.getComment() ) ) : '' );
+ .append( rev.getComment() ? $( '' ).append(
'' ).text( mw.html.escape( rev.getComment() ) ) : '' )
+ .append( $( '' ).html( rev.getSize() + '
bytes' ) )
+ .append( rev.getIsMinor() ? $( '' ).html(
'minor edit' ) : '' );
return $( '' ).append( $tooltip ).html();
}
diff --git a/tests/RevisionSlider.Revision.test.js
b/tests/RevisionSlider.Revision.test.js
index b807492..19f6235 100644
--- a/tests/RevisionSlider.Revision.test.js
+++ b/tests/RevisionSlider.Revision.test.js
@@ -16,6 +16,26 @@
assert.equal( rev.getParsedComment(), data.parsedcomment );
assert.equal( rev.getFormattedDate(), '10:27, 26 Apr 2016' );
assert.equal( rev.getUser(), data.user );
+ assert.equal( rev.getIsMinor, false );
+ } );
+
+ QUnit.test( 'create minor Revision', function ( assert ) {
+ var data = {
+ size: 5,
+ comment: 'hello',
+ parsedcomment: 'hello',
+ timestamp: '2016-04-26T10:27:14Z', // 10:27, 26
Apr 2016
+ user: 'meh',
+ minor: ''
+ },
+ rev = new mw.libs.revisionSlider.Revision( data );
+
+ assert.equal( rev.getSize(), data.size );
+ assert.equal( rev.getComment(), data.comment );
+ assert.equal( rev.getParsedComment(), data.parsedcomment );
+ assert.equal( rev.getFormattedDate(), '10:27, 26 Apr 2016' );
+ assert.equal( rev.getUser(), data.user );
+ assert.equal( rev.getIsMinor, true );
} );
QUnit.test( 'get Revision with section', function ( assert ) {
--
To view, visit https://gerrit.wikimedia.org/r/288374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc90a2f8a03693df092a4785cfe2fdfcc85730a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
