Adapt to DataValuesJavaScript 0.7.0 #162
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ | |
| }, | ||
| "require": { | ||
| "php": ">=5.3.0", | ||
| "data-values/javascript": "~0.7.0" | ||
| }, | ||
| "autoload": { | ||
| "files": [ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,6 @@ | ||
| ( function( $, vv, TimeValue ) { | ||
| 'use strict'; | ||
|
|
||
| var PARENT = vv.experts.StringValue; | ||
|
|
||
| /** | ||
|
|
@@ -38,7 +35,7 @@ | |
| $.proxy( this._onRotatorChange, this ), | ||
| function() { | ||
| var value = self.viewState().value(); | ||
| return value && value.getOption( 'precision' ); | ||
| } | ||
| ); | ||
|
|
||
|
|
@@ -53,7 +50,7 @@ | |
| $.proxy( this._onRotatorChange, this ), | ||
| function() { | ||
| var value = self.viewState().value(); | ||
| return value && value.getOption( 'calendarModel' ); | ||
|
Contributor
There was a problem hiding this comment. I was referring to this line. I fixed it in my commit, see 929a808#diff-49060d53e8ad9e0d74b8e4ea672589a5L53. |
||
| } | ||
| ); | ||
|
|
||
|
|
@@ -64,8 +61,7 @@ | |
| new vv.ExpertExtender.CalendarHint( | ||
| this._messageProvider, | ||
| function() { | ||
| return self.viewState().value(); | ||
| }, | ||
| function( value ) { | ||
| // FIXME: Do not use private function: | ||
|
|
@@ -143,13 +139,13 @@ | |
| valueCharacteristics: function() { | ||
| var options = {}, | ||
| precision = this.precisionRotator && this.precisionRotator.getValue() || null, | ||
| calendarUri = this.calendarRotator && this.calendarRotator.getValue() || null; | ||
|
|
||
| if( precision !== null ) { | ||
| options.precision = precision; | ||
| } | ||
| if( calendarUri !== null ) { | ||
| options.calendar = calendarUri; | ||
| } | ||
|
|
||
| return options; | ||
|
|
@@ -162,11 +158,12 @@ | |
| * @return {Object[]} [{ value: <{number}>, label: <{string}>}, ...] | ||
| */ | ||
| function getPrecisionValues() { | ||
| var precisionValues = [], | ||
| dayPrecision = TimeValue.getPrecisionById( 'DAY' ); | ||
| $.each( TimeValue.PRECISIONS, function( precisionValue, precision ) { | ||
| if( precisionValue <= dayPrecision ) { | ||
| // TODO: Remove this check as soon as time values are supported. | ||
| precisionValues.unshift( { value: precisionValue, label: precision.text } ); | ||
| } | ||
| } ); | ||
| return precisionValues; | ||
|
|
@@ -180,23 +177,13 @@ | |
| */ | ||
| function getCalendarValues( messageProvider ) { | ||
| var calendarValues = []; | ||
| $.each( TimeValue.CALENDARS, function( key, uri ) { | ||
| var label = messageProvider.getMessage( | ||
| 'valueview-expert-timevalue-calendar-' + key.toLowerCase() | ||
| ) || key.toLowerCase(); | ||
| calendarValues.push( { value: uri, label: label } ); | ||
| } ); | ||
| return calendarValues; | ||
| } | ||
|
|
||
| }( jQuery, jQuery.valueview, dataValues.TimeValue ) ); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where does a
calendarModelcalendarNameoption come from? I think it doesn't exist and needs to be replaced with aTimeValue.getCalendarModelKeyByUricall.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, you did not test the pull request after your additional changes in DataValuesJavaScript? What do you expect
value.getOption( 'calendarModel' )to return being aware thatvalueis aTimeValueobject (https://github.com/wmde/DataValuesJavascript/blob/master/src/values/TimeValue.js)? If it is nor the URI, something is wrong as the call toTimeValue.getCalendarModelKeyByUriis just two lines below.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I put the comment on the wrong line, see the
calendarNameoption below.