From: Moriel Schottlender Date: Mon, 24 Jul 2017 19:37:32 +0000 (-0700) Subject: RCFilters: Hide hours temporarily since they don't work X-Git-Tag: 1.31.0-rc.0~2619^2 X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=c7c112a8f219857fb5527713aaacb50a599ee1f6;p=lhc%2Fweb%2Fwiklou.git RCFilters: Hide hours temporarily since they don't work Change-Id: I5cdffb0a13db569cb824dd2ca2b5d9f69ad6b036 --- diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index 5ebec27164..cced3d52ed 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -118,7 +118,8 @@ 'default': '7', filters: [ // Hours (1, 2, 6, 12) - 0.04166, 0.0833, 0.25, 0.5, + // TEMPORARY: Hide hours temporarily + // 0.04166, 0.0833, 0.25, 0.5, // Days 1, 3, 7, 14, 30 ].map( function ( num ) { @@ -168,9 +169,12 @@ uriValue, // In this case we don't want to round because it can be arbitrary // weird numbers but we want to round to 2 decimal digits - Number( uriValue ) < 1 ? - ( Number( uriValue ) * 24 ).toFixed( 2 ) : - Number( uriValue ) + + // HACK: Temporarily remove hours from UI + // Number( uriValue ) < 1 ? + // ( Number( uriValue ) * 24 ).toFixed( 2 ) : + // Number( uriValue ) + Number( uriValue ) ) ); } else { groupData.filters.push( createFilterDataFromNumber( uriValue, uriValue ) ); diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js index 1569f38662..681b350441 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js @@ -105,8 +105,11 @@ if ( item ) { this.button.setLabel( mw.msg( - Number( item.getParamName() ) < 1 ? - 'rcfilters-days-show-hours' : 'rcfilters-days-show-days', + // Number( item.getParamName() ) < 1 ? + // 'rcfilters-days-show-hours' : 'rcfilters-days-show-days', + + // Temporarily hide the functionality for hours, use days only + 'rcfilters-days-show-days', item.getLabel() ) ); diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js index 6971df520b..ac841c0302 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js @@ -16,6 +16,8 @@ this.model = model; + /* + // HACK: Temporarily remove hours from UI this.hoursValuePicker = new mw.rcfilters.ui.ValuePickerWidget( this.model, { @@ -23,25 +25,28 @@ label: mw.msg( 'rcfilters-hours-title' ), itemFilter: function ( itemModel ) { return Number( itemModel.getParamName() ) < 1; } } - ); + );*/ this.daysValuePicker = new mw.rcfilters.ui.ValuePickerWidget( this.model, { classes: [ 'mw-rcfilters-ui-datePopupWidget-days' ], - label: mw.msg( 'rcfilters-days-title' ), - itemFilter: function ( itemModel ) { return Number( itemModel.getParamName() ) >= 1; } + label: mw.msg( 'rcfilters-days-title' ) + // HACK: Temporarily remove hours from UI + // itemFilter: function ( itemModel ) { return Number( itemModel.getParamName() ) >= 1; } } ); // Events - this.hoursValuePicker.connect( this, { choose: [ 'emit', 'days' ] } ); + // HACK: Temporarily remove hours from UI + // this.hoursValuePicker.connect( this, { choose: [ 'emit', 'days' ] } ); this.daysValuePicker.connect( this, { choose: [ 'emit', 'days' ] } ); // Initialize this.$element .addClass( 'mw-rcfilters-ui-datePopupWidget' ) .append( - this.hoursValuePicker.$element, + // HACK: Temporarily remove hours from UI + // this.hoursValuePicker.$element, this.daysValuePicker.$element ); };