Tobias Gritschacher has submitted this change and it was merged.
Change subject: Removed hard-coded mediaWiki dependency from TimeInput expert
......................................................................
Removed hard-coded mediaWiki dependency from TimeInput expert
mediaWiki JavaScript object may be passed as option to the expert now.
Needs change I3a5dd856b946b526684532c16867747a9b902dd9 in Wikibase extension to
take effect.
Change-Id: Idb34978e9d5536816514ae345ca0473aded873c4
---
M ValueView/resources/jquery.valueview/valueview.BifidExpert.js
M ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
M ValueView/resources/jquery.valueview/valueview.valueview.js
3 files changed, 44 insertions(+), 13 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/ValueView/resources/jquery.valueview/valueview.BifidExpert.js
b/ValueView/resources/jquery.valueview/valueview.BifidExpert.js
index e95dae1..6116a98 100644
--- a/ValueView/resources/jquery.valueview/valueview.BifidExpert.js
+++ b/ValueView/resources/jquery.valueview/valueview.BifidExpert.js
@@ -94,7 +94,8 @@
this.$viewPort,
this._viewState,
this._viewNotifier,
- newExpertOptions
+ // Pass common and individual expert
options:
+ $.extend( {}, this._options,
newExpertOptions )
);
this._currentExpert.rawValue( rawValue );
diff --git
a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
index dc69d7a..fc23a57 100644
---
a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
+++
b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
@@ -5,8 +5,7 @@
* @author Daniel Werner < [email protected] >
* @author H. Snater < [email protected] >
*/
-// TODO: Remove mediaWiki dependency
-( function( dv, vp, $, vv, time, mw ) {
+( function( dv, vp, $, vv, time ) {
'use strict';
var Time = time.Time,
@@ -82,7 +81,14 @@
this.$precisionContainer = $( '<div/>' )
.addClass( this.uiBaseClass + '-precisioncontainer' )
- .append( $( '<div/>' ).text( mw.msg(
'valueview-expert-timeinput-precision' ) ) );
+ .append(
+ $( '<div/>' ).text(
+ ( this._options.mediaWiki )
+ ? this._options.mediaWiki.msg(
'valueview-expert-timeinput-precision' )
+ // TODO: Use default messages
+ : ''
+ )
+ );
var precisionValues = [];
$.each( timeSettings.precisiontexts, function( i, text
) {
@@ -115,7 +121,13 @@
this.$calendarContainer = $( '<div/>' )
.addClass( this.uiBaseClass + '-calendarcontainer' )
- .append( $( '<div/>' ).text( mw.msg(
'valueview-expert-timeinput-calendar' ) ) );
+ .append(
+ $( '<div/>' ).text(
+ ( this._options.mediaWiki )
+ ? this._options.mediaWiki.msg(
'valueview-expert-timeinput-calendar' )
+ : ''
+ )
+ );
var calendarValues = [];
$.each( timeSettings.calendarnames, function( i,
calendarTerms ) {
@@ -143,7 +155,11 @@
var $toggler = $( '<a/>' )
.addClass( this.uiBaseClass + '-advancedtoggler' )
- .text( mw.msg( 'valueview-expert-advancedadjustments' )
);
+ .text(
+ ( this._options.mediaWiki )
+ ? this._options.mediaWiki.msg(
'valueview-expert-advancedadjustments' )
+ : ''
+ );
this.$calendarhint = $( '<div/>' )
.addClass( this.uiBaseClass + '-calendarhint' )
@@ -280,8 +296,13 @@
? timeSettings.calendarnames[1][0]
: timeSettings.calendarnames[0][0];
- this.$calendarhint.children( '.' +
this.uiBaseClass + '-calendarhint-message' )
- .text( mw.msg(
'valueview-expert-timeinput-calendarhint', value.calendarText() ) );
+ if( this._options.mediaWiki ) {
+ this.$calendarhint.children( '.' +
this.uiBaseClass + '-calendarhint-message' )
+ .text( this._options.mediaWiki.msg(
+
'valueview-expert-timeinput-calendarhint',
+ value.calendarText()
+ ) );
+ }
this.$calendarhint.children( '.' +
this.uiBaseClass + '-calendarhint-switch' )
.off( 'click.' + this.uiBaseClass )
@@ -290,7 +311,10 @@
self._updateValue();
} );
} )
- .html( mw.msg(
'valueview-expert-timeinput-calendarhint-switch', otherCalendar ) );
+ .html( ( this._options.mediaWiki )
+ ? this._options.mediaWiki.msg(
'valueview-expert-timeinput-calendarhint-switch', otherCalendar )
+ : ''
+ );
this.$calendarhint.show();
} else {
@@ -385,4 +409,4 @@
}
} );
-}( dataValues, valueParsers, jQuery, jQuery.valueview, time, mediaWiki ) );
+}( dataValues, valueParsers, jQuery, jQuery.valueview, time ) );
diff --git a/ValueView/resources/jquery.valueview/valueview.valueview.js
b/ValueView/resources/jquery.valueview/valueview.valueview.js
index 699e508..55b4f20 100644
--- a/ValueView/resources/jquery.valueview/valueview.valueview.js
+++ b/ValueView/resources/jquery.valueview/valueview.valueview.js
@@ -56,6 +56,8 @@
* initialization if its initial value is empty.
* Default: true
*
+ * @option mediaWiki {Object} mediaWiki JavaScript object that may be used in
MediaWiki environment.
+ *
* @event change: Triggered when the widget's value is updated.
* (1) {jQuery.event} event
*
@@ -112,7 +114,8 @@
expertProvider: null,
on: null,
value: null,
- autoStartEditing: false
+ autoStartEditing: false,
+ mediaWiki: null
},
/**
@@ -374,7 +377,7 @@
}
// Previous expert not suitable for the new task!
- // Destroy old expert, create enw one suitable for value:
+ // Destroy old expert, create new one suitable for value:
if( this._expert ) {
this._expert.destroy();
this._expert = null;
@@ -384,7 +387,10 @@
this._expert = new NewExpert(
this.$value,
this.viewState(),
- this.viewNotifier()
+ this.viewNotifier(),
+ {
+ mediaWiki: this.options.mediaWiki
+ }
);
}
},
--
To view, visit https://gerrit.wikimedia.org/r/67403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb34978e9d5536816514ae345ca0473aded873c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
