mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/RevisionSlider
synced 2024-11-27 16:50:09 +00:00
Remove last SliderViewTwo parts
Bug: T165747 Change-Id: I9ac410613361e567bd825f096eb12bbb3edc5cde
This commit is contained in:
WMDE-Fisch
parent
d299926ff9
commit
edfd885543
|
|
@ -21,10 +21,6 @@
|
|||
"ConfigRegistry": {
|
||||
"revisionslider": "GlobalVarConfig::newInstance"
|
||||
},
|
||||
"config": {
|
||||
"@RevisionSliderAlternateSlider": "Enables the alternate version of the sliding mechanism.",
|
||||
"RevisionSliderAlternateSlider": false
|
||||
},
|
||||
"MessagesDirs": {
|
||||
"RevisionSlider": [
|
||||
"i18n"
|
||||
|
|
@ -144,8 +140,7 @@
|
|||
"ext.RevisionSlider.SliderView": {
|
||||
"scripts": [
|
||||
"modules/ext.RevisionSlider.SliderView.js",
|
||||
"modules/ext.RevisionSlider.SliderArrowView.js",
|
||||
"modules/ext.RevisionSlider.SliderViewTwo.js"
|
||||
"modules/ext.RevisionSlider.SliderArrowView.js"
|
||||
],
|
||||
"dependencies": [
|
||||
"jquery.ui.draggable",
|
||||
|
|
@ -229,7 +224,6 @@
|
|||
"messages": [
|
||||
"revisionslider-help-dialog-slide1",
|
||||
"revisionslider-help-dialog-slide2",
|
||||
"revisionslider-help-dialog-slide3",
|
||||
"revisionslider-help-dialog-slide3a",
|
||||
"revisionslider-help-dialog-slide4",
|
||||
"revisionslider-tutorial",
|
||||
|
|
@ -250,15 +244,6 @@
|
|||
}
|
||||
},
|
||||
"2": "resources/ext.RevisionSlider.helpDialog/slide2.svg",
|
||||
"3": "resources/ext.RevisionSlider.helpDialog/slide3.svg",
|
||||
"4": "resources/ext.RevisionSlider.helpDialog/slide4.svg",
|
||||
"1a": {
|
||||
"file": {
|
||||
"ltr": "resources/ext.RevisionSlider.helpDialog/slide1-ltr.svg",
|
||||
"rtl": "resources/ext.RevisionSlider.helpDialog/slide1-rtl.svg"
|
||||
}
|
||||
},
|
||||
"2a": "resources/ext.RevisionSlider.helpDialog/slide2.svg",
|
||||
"3a": "resources/ext.RevisionSlider.helpDialog/slide3a.svg",
|
||||
"4a": "resources/ext.RevisionSlider.helpDialog/slide4a.svg"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
"revisionslider-show-help-tooltip": "Show help text",
|
||||
"revisionslider-help-dialog-slide1": "The revision slider helps you to navigate and compare revisions on the diff page. It is based on a [//meta.wikimedia.org/wiki/WMDE_Technical_Wishes/RevisionSlider community wish] from the German-speaking community technical wishlist. Feedback is very much appreciated [//www.mediawiki.org/wiki/Extension_talk:RevisionSlider here].",
|
||||
"revisionslider-help-dialog-slide2": "Each bar represents a page revision. Bars on the top show growth in size of the page, bars on the bottom show a reduction. In the image, revision 1 represents added content, while revision 2 represents removal of content.",
|
||||
"revisionslider-help-dialog-slide3": "<p>To compare certain revisions, select the revisions using the yellow and blue pointer.</p><p>The blue pointer controls the newer revision, the yellow pointer maps to the older revision.</p><p>Move the pointers by drag and drop or click on a bar.</p>",
|
||||
"revisionslider-help-dialog-slide3a": "<p>To compare certain revisions, select the revisions using the yellow and blue knobs.</p><p>The blue knob controls the newer revision, the yellow knob maps to the older revision.</p><p>Move the knobs by drag and drop or clicking on the slider line.</p>",
|
||||
"revisionslider-help-dialog-slide4": "Use the backward and forward arrows to move through revision history and show older and newer revisions.",
|
||||
"revisionslider-tutorial": "Revision slider tutorial",
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
"revisionslider-show-help-tooltip": "Text shown in a tooltip for the \"Show help\" button.",
|
||||
"revisionslider-help-dialog-slide1": "Text shown on the first slide of the help dialog.",
|
||||
"revisionslider-help-dialog-slide2": "Text shown on the second slide of the help dialog.",
|
||||
"revisionslider-help-dialog-slide3": "Text shown on the third slide of the help dialog.",
|
||||
"revisionslider-help-dialog-slide3a": "Text shown on the third slide of the help dialog for the new slider layout.",
|
||||
"revisionslider-help-dialog-slide4": "Text shown on the fourth slide of the help dialog.",
|
||||
"revisionslider-tutorial": "Text shown above the RevisionSlider tutorial. This should contain as few words as possible to avoid being truncated.",
|
||||
|
|
|
|||
|
|
@ -90,13 +90,8 @@
|
|||
*/
|
||||
getSlide3: function () {
|
||||
var slide = new OO.ui.PanelLayout( { $: this.$, padded: true, expanded: false } ),
|
||||
msgKey = 'revisionslider-help-dialog-slide3',
|
||||
className = 'mw-revslider-help-dialog-slide-3';
|
||||
|
||||
if ( mw.config.get( 'extRevisionSliderAlternateSlider' ) ) {
|
||||
msgKey = 'revisionslider-help-dialog-slide3a';
|
||||
msgKey = 'revisionslider-help-dialog-slide3a',
|
||||
className = 'mw-revslider-help-dialog-slide-3a';
|
||||
}
|
||||
|
||||
slide.$element
|
||||
.append( $( '<div>' ).addClass( 'mw-revslider-help-dialog-image-portrait ' + className + ' mw-revslider-column-image' ) )
|
||||
|
|
@ -114,11 +109,7 @@
|
|||
*/
|
||||
getSlide4: function () {
|
||||
var slide = new OO.ui.PanelLayout( { $: this.$, padded: true, expanded: false } ),
|
||||
className = 'mw-revslider-help-dialog-slide-4';
|
||||
|
||||
if ( mw.config.get( 'extRevisionSliderAlternateSlider' ) ) {
|
||||
className = 'mw-revslider-help-dialog-slide-4a';
|
||||
}
|
||||
|
||||
slide.$element
|
||||
.append( $( '<div>' ).addClass( 'mw-revslider-help-dialog-image-landscape ' + className ) )
|
||||
|
|
|
|||
|
|
@ -7,11 +7,7 @@
|
|||
*/
|
||||
var Slider = function ( revisions ) {
|
||||
this.revisions = revisions;
|
||||
if ( mw.config.get( 'extRevisionSliderAlternateSlider' ) ) {
|
||||
this.view = new mw.libs.revisionSlider.SliderViewTwo( this );
|
||||
} else {
|
||||
this.view = new mw.libs.revisionSlider.SliderView( this );
|
||||
}
|
||||
this.view = new mw.libs.revisionSlider.SliderView( this );
|
||||
};
|
||||
|
||||
$.extend( Slider.prototype, {
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
( function ( mw, $ ) {
|
||||
/**
|
||||
* Module handling the view logic of the RevisionSlider slider with two slides
|
||||
*
|
||||
* @param {Slider} slider
|
||||
* @constructor
|
||||
*/
|
||||
var SliderViewTwo = function ( slider ) {
|
||||
this.slider = slider;
|
||||
this.diffPage = new mw.libs.revisionSlider.DiffPage( this.slider.getRevisions() );
|
||||
};
|
||||
|
||||
OO.inheritClass( SliderViewTwo, mw.libs.revisionSlider.SliderView );
|
||||
|
||||
$.extend( SliderViewTwo.prototype, {
|
||||
|
||||
} );
|
||||
|
||||
mw.libs.revisionSlider = mw.libs.revisionSlider || {};
|
||||
mw.libs.revisionSlider.SliderViewTwo = SliderViewTwo;
|
||||
}( mediaWiki, jQuery ) );
|
||||
|
|
@ -138,9 +138,6 @@
|
|||
}
|
||||
} );
|
||||
|
||||
if ( mw.config.get( 'extRevisionSliderAlternateSlider' ) ) {
|
||||
mw.loader.load( 'ext.RevisionSlider.SliderViewTwo' );
|
||||
}
|
||||
expand();
|
||||
initialize();
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
<svg width="180" height="198.673" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 338.2583 373.34968"><defs><marker orient="auto" id="a" overflow="visible"><path d="M4.616 0l-6.92 4v-8l6.92 4z" fill-rule="evenodd" stroke="#000" stroke-width=".8pt"/></marker><marker orient="auto" id="b" overflow="visible"><path d="M4.616 0l-6.92 4v-8l6.92 4z" fill-rule="evenodd" stroke="#000" stroke-width=".8pt"/></marker></defs><path fill="#e3e3e3" d="M49.328 41.93h16.213v55.507H49.328zM65.542 41.93h16.213V20.468H65.542z"/><path fill="#fee6a8" d="M81.755 41.93h16.213v46.872H81.755z"/><path fill="#e3e3e3" d="M97.968 41.93h16.213v38.96H97.968zM114.181 41.93h16.213V0h-16.213zM130.395 41.93h16.213V16.11h-16.213zM146.608 41.93h16.213V6.522h-16.213zM162.821 41.928h16.213v23.617h-16.213zM179.035 41.93h16.213v42.086h-16.213zM195.248 41.93h16.213V13.624h-16.213zM211.461 41.928h16.213v23.617h-16.213z"/><path fill="#bcbcbc" d="M97.968 41.93h16.213v38.96H97.968zM114.181 41.93h16.213V0h-16.213zM130.395 41.93h16.213V16.11h-16.213zM146.608 41.93h16.213V6.522h-16.213zM162.821 41.928h16.213v23.617h-16.213z"/><path fill="#c3e2ff" d="M179.035 42.481h16.213v42.087h-16.213z"/><path fill="#e3e3e3" d="M195.248 41.93h16.213V13.624h-16.213zM211.461 41.928h16.213v23.617h-16.213zM227.675 41.924h16.213v46.43h-16.213z"/><path opacity=".937" fill="#bcbcbc" d="M97.966 41.784h170.705v1.212H97.966z"/><g fill="#fdc44b" stroke="#dda000"><path transform="matrix(0 .4934 .59638 0 638.158 651.644)" d="M-1231.824-918.09l9.38-5.414 9.379-5.416v21.661l-9.38-5.415z" opacity=".17"/><path transform="matrix(0 .4934 .59638 0 637.198 651.1)" d="M-1231.824-918.09l9.38-5.414 9.379-5.416v21.661l-9.38-5.415z"/></g><path transform="matrix(0 -.50472 .61006 0 748.904 -580.828)" d="M-1231.824-918.09l9.38-5.414 9.379-5.416v21.661l-9.38-5.415z" opacity=".099" fill-opacity=".958" stroke="#000" stroke-opacity=".553"/><path d="M-1231.824-918.09l9.38-5.414 9.379-5.416v21.661l-9.38-5.415z" transform="matrix(0 -.50472 .61006 0 748.556 -581.874)" fill="#45a6ff" stroke="#065cad"/><path opacity=".937" fill="#dda000" d="M81.753 41.773h16.235v1.212H81.753z"/><path opacity=".937" fill="#065cad" d="M179.044 41.784h16.21v1.212h-16.21z"/><g transform="translate(-839.55 -1406.386)"><path fill="#fee6a8" d="M839.551 1554.836h156.258v224.899H839.551z"/><path fill="#c3e2ff" d="M1021.551 1554.836h156.258v224.899h-156.258z"/><rect width="122.738" height="5.789" x="850.202" y="1604.458" ry="0" opacity=".102"/><rect width="125.567" height="5.789" x="850.378" y="1622.256" ry="0" opacity=".102"/><rect width="129.456" height="5.789" x="850.378" y="1640.055" ry="0" opacity=".102"/><rect width="72.18" height="5.789" x="850.378" y="1657.854" ry="0" opacity=".102"/><rect width="41.068" height="5.789" x="850.378" y="1689.146" ry="0" opacity=".102"/><rect width="122.738" height="5.789" x="850.378" y="1706.513" ry="0" opacity=".102"/><rect width="125.567" height="5.789" x="850.378" y="1723.881" ry="0" opacity=".102"/><rect width="57.685" height="5.789" x="850.378" y="1741.249" ry="0" opacity=".102"/><rect width="134.406" height="5.789" x="1032.105" y="1604.104" ry="0" opacity=".319"/><rect width="125.567" height="5.789" x="1031.398" y="1621.549" ry="0" opacity=".319"/><rect width="117.081" height="5.789" x="1031.398" y="1638.995" ry="0" opacity=".319"/><rect width="31.168" height="5.789" x="1031.398" y="1656.44" ry="0" opacity=".319"/><rect width="41.068" height="5.789" x="1031.398" y="1687.731" ry="0" opacity=".319"/><rect width="125.567" height="5.789" x="1031.398" y="1705.099" ry="0" opacity=".319"/><rect width="107.182" height="5.789" x="1031.398" y="1722.467" ry="0" opacity=".319"/><rect width="57.685" height="5.789" x="1031.398" y="1739.835" ry="0" opacity=".319"/><rect ry="0" y="1586.659" x="850.732" height="5.789" width="122.738" opacity=".102"/><rect width="72.534" height="11.446" x="850.732" y="1565.446" ry="0" opacity=".102"/><rect ry="0" y="1586.659" x="1031.751" height="5.789" width="134.406" opacity=".319"/><rect width="90.565" height="9.678" x="1031.398" y="1565.446" ry="0" opacity=".319"/><path d="M1028.506 1504.349l72.869 42.401" fill="none" stroke="#000" marker-end="url(#a)"/><path d="M928.61 1504.493l-12.235 42.257" fill="none" stroke="#000" marker-end="url(#b)"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 4.2 KiB |
|
|
@ -1 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="267.121" height="122.485" viewBox="0 0 267.12106 122.48537"><path fill="#e3e3e3" d="M36.501 57.065h16.213v55.508H36.501zM52.715 57.066h16.213V35.604H52.715z"/><path fill="#fee6a8" d="M68.928 57.065h16.213v46.873H68.928z"/><path fill="#e3e3e3" d="M85.141 57.065h16.213v38.96H85.141zM101.354 57.065h16.213v-41.93h-16.213zM117.568 57.065h16.213v-25.82h-16.213zM133.781 57.065h16.213V21.659h-16.213zM149.994 57.064h16.213V80.68h-16.213zM166.208 57.065h16.213v42.087h-16.213zM182.421 57.066h16.213V28.76h-16.213zM198.634 57.064h16.213V80.68h-16.213z"/><path fill="#bcbcbc" d="M85.141 57.065h16.213v38.96H85.141zM101.354 57.065h16.213v-41.93h-16.213zM117.568 57.065h16.213v-25.82h-16.213zM133.781 57.065h16.213V21.659h-16.213zM149.994 57.064h16.213V80.68h-16.213z"/><path fill="#c3e2ff" d="M166.208 57.617h16.213v42.087h-16.213z"/><path fill="#e3e3e3" d="M182.421 57.066h16.213V28.76h-16.213zM198.634 57.064h16.213V80.68h-16.213zM214.848 57.06h16.213v46.43h-16.213z"/><path opacity=".937" fill="#bcbcbc" d="M85.14 56.92h146.204v1.212H85.14z"/><g fill="#fdc44b" stroke="#dda000"><path transform="matrix(0 .4934 .59638 0 625.33 666.78)" d="M-1231.824-918.09l9.38-5.414 9.379-5.416v21.661l-9.38-5.415z" opacity=".17"/><path transform="matrix(0 .4934 .59638 0 624.371 666.236)" d="M-1231.824-918.09l9.38-5.414 9.379-5.416v21.661l-9.38-5.415z"/></g><path transform="matrix(0 -.50472 .61006 0 736.077 -565.693)" d="M-1231.824-918.09l9.38-5.414 9.379-5.416v21.661l-9.38-5.415z" opacity=".099" fill-opacity=".958" stroke="#000" stroke-opacity=".553"/><path d="M-1231.824-918.09l9.38-5.414 9.379-5.416v21.661l-9.38-5.415z" transform="matrix(0 -.50472 .61006 0 735.729 -566.738)" fill="#45a6ff" stroke="#065cad"/><path opacity=".937" fill="#dda000" d="M68.926 56.909h16.235v1.212H68.926z"/><path opacity=".937" fill="#065cad" d="M166.217 56.92h16.21v1.212h-16.21z"/><path fill="#fff" stroke="#dadada" stroke-width="1.621" d="M.81.81h23.158v120.662H.81z"/><path d="M15.33 54.91l-9.15 6.663 9.098 6.698" fill="none" stroke="#171717" stroke-width="2.956" stroke-linecap="round" stroke-linejoin="round"/><path fill="#fff" stroke="#dadada" stroke-width="1.621" d="M266.31.81h-23.158v120.662h23.158z"/><path d="M251.79 52.652l9.15 6.664-9.097 6.698" fill="none" stroke="#171717" stroke-width="2.956" stroke-linecap="round" stroke-linejoin="round"/><path opacity=".572" fill="#fff" d="M29.173 1.486h209.5v121h-209.5z"/></svg>
|
||||
|
Before Width: | Height: | Size: 2.4 KiB |
|
|
@ -88,10 +88,6 @@ class RevisionSliderHooks {
|
|||
$out->addJsConfigVars( 'extRevisionSliderOldRev', $oldRev->getId() );
|
||||
$out->addJsConfigVars( 'extRevisionSliderNewRev', $newRev->getId() );
|
||||
$out->addJsConfigVars( 'extRevisionSliderTimeOffset', intval( $timeOffset ) );
|
||||
$out->addJsConfigVars(
|
||||
'extRevisionSliderAlternateSlider',
|
||||
$config->get( 'RevisionSliderAlternateSlider' )
|
||||
);
|
||||
$out->enableOOUI();
|
||||
|
||||
$toggleButton = new OOUI\ButtonWidget( [
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
);
|
||||
assert.equal(
|
||||
getSlideTextHtml( helpDialog.slides[ 2 ] ),
|
||||
addLinkTargets( mw.message( 'revisionslider-help-dialog-slide3' ).parse() )
|
||||
addLinkTargets( mw.message( 'revisionslider-help-dialog-slide3a' ).parse() )
|
||||
);
|
||||
assert.equal(
|
||||
getSlideTextHtml( helpDialog.slides[ 3 ] ),
|
||||
|
|
|
|||
Loading…
Reference in a new issue