From: Catrope <roan@wikimedia.org>
Date: Mon, 24 Jul 2017 23:49:33 +0000 (+0000)
Subject: Revert "RCFilters: Hide hours temporarily since they don't work"
X-Git-Tag: 1.31.0-rc.0~2605^2
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=fa812e82d1627471a9df701d951182bdb7c46744;p=lhc%2Fweb%2Fwiklou.git

Revert "RCFilters: Hide hours temporarily since they don't work"

With support for fractional days values in the back end,
they now do work.

This reverts commit c7c112a8f219857fb5527713aaacb50a599ee1f6.

Change-Id: Ib15256d4541ecebdb29fe294c5285e63e37f9fee
---

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index cced3d52ed..5ebec27164 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -118,8 +118,7 @@
 					'default': '7',
 					filters: [
 						// Hours (1, 2, 6, 12)
-						// TEMPORARY: Hide hours temporarily
-						// 0.04166, 0.0833, 0.25, 0.5,
+						0.04166, 0.0833, 0.25, 0.5,
 						// Days
 						1, 3, 7, 14, 30
 					].map( function ( num ) {
@@ -169,12 +168,9 @@
 							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
-
-							// HACK: Temporarily remove hours from UI
-							// Number( uriValue ) < 1 ?
-							// 	( Number( uriValue ) * 24 ).toFixed( 2 ) :
-							// 	Number( uriValue )
-							Number( uriValue )
+							Number( uriValue ) < 1 ?
+								( Number( uriValue ) * 24 ).toFixed( 2 ) :
+								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 681b350441..1569f38662 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js
@@ -105,11 +105,8 @@
 		if ( item ) {
 			this.button.setLabel(
 				mw.msg(
-					// 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',
+					Number( item.getParamName() ) < 1 ?
+						'rcfilters-days-show-hours' : '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 ac841c0302..6971df520b 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
@@ -16,8 +16,6 @@
 
 		this.model = model;
 
-		/*
-		// HACK: Temporarily remove hours from UI
 		this.hoursValuePicker = new mw.rcfilters.ui.ValuePickerWidget(
 			this.model,
 			{
@@ -25,28 +23,25 @@
 				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' )
-				// HACK: Temporarily remove hours from UI
-				// itemFilter: function ( itemModel ) { return Number( itemModel.getParamName() ) >= 1; }
+				label: mw.msg( 'rcfilters-days-title' ),
+				itemFilter: function ( itemModel ) { return Number( itemModel.getParamName() ) >= 1; }
 			}
 		);
 
 		// Events
-		// HACK: Temporarily remove hours from UI
-		// this.hoursValuePicker.connect( this, { choose: [ 'emit', 'days' ] } );
+		this.hoursValuePicker.connect( this, { choose: [ 'emit', 'days' ] } );
 		this.daysValuePicker.connect( this, { choose: [ 'emit', 'days' ] } );
 
 		// Initialize
 		this.$element
 			.addClass( 'mw-rcfilters-ui-datePopupWidget' )
 			.append(
-				// HACK: Temporarily remove hours from UI
-				// this.hoursValuePicker.$element,
+				this.hoursValuePicker.$element,
 				this.daysValuePicker.$element
 			);
 	};