Skip to content

Chrome: Adding the post date picker to schedule posts #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowriad merged 8 commits into from
May 25, 2017
Merged

Chrome: Adding the post date picker to schedule posts #841

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb8b1d9
Chrome: Adding the post date picker to schedule posts
youknowriad May 19, 2017
3568362
Post Schedule: Include wp.date script and localize the datepicker
youknowriad May 22, 2017
9625759
Post Schedule: Depending on the timezone show/hide the AM/PM selector
youknowriad May 22, 2017
45e1913
WP Date: Fix PHPCS test
youknowriad May 22, 2017
8189cb7
WP Date: Fix JS unit tests
youknowriad May 22, 2017
27fd6c9
Post Schedule: Prefill the post schedule modal
youknowriad May 22, 2017
cce5fdb
Move date picker styles into PostSchedule stylesheet
aduth May 22, 2017
b7e0954
Chrome: Check more accurately the 12 hour time
youknowriad May 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Post Schedule: Depending on the timezone show/hide the AM/PM selector
  • Loading branch information
@youknowriad
youknowriad committed May 24, 2017
commit 9625759d8d563157281d0113a15ff4512f556639
18 changes: 12 additions & 6 deletions editor/sidebar/post-schedule/clock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@
import { __ } from 'i18n';
import Button from 'components/button';

function PostScheduleClock( { selected, onChange } ) {
function PostScheduleClock( { is12Hour, selected, onChange } ) {
const minutes = selected ? selected.format( 'mm' ) : '';
const am = selected ? selected.format( 'A' ) : 'AM';
const hours = selected ? selected.format( 'hh' ) : '';
const hours = selected ? selected.format( is12Hour ? 'hh' : 'HH' ) : '';

const updateHours = ( event ) => {
const value = parseInt( event.target.value, 10 );
if ( value < 1 || value > 12 ) {
if (
( is12Hour && ( value < 1 || value > 12 ) ) ||
( ! is12Hour && ( value < 0 || value > 23 ) )
) {
return;
}
const newDate = selected.clone().hours( am === 'AM' ? value % 12 : ( ( ( value % 12 ) + 12 ) % 24 ) );

const newDate = is12Hour
? selected.clone().hours( am === 'AM' ? value % 12 : ( ( ( value % 12 ) + 12 ) % 24 ) )
: selected.clone().hours( value );
onChange( newDate );
};

Expand Down Expand Up @@ -58,7 +64,7 @@ function PostScheduleClock( { selected, onChange } ) {
value={ minutes }
onChange={ updateMinutes }
/>
<div>
{ is12Hour && <div>
<Button
className="button-secondary editor-post-schedule__clock-am-button"
isToggled={ am === 'AM' }
Expand All @@ -73,7 +79,7 @@ function PostScheduleClock( { selected, onChange } ) {
>
{ __( 'PM' ) }
</Button>
</div>
</div> }
</div>
);
}
Expand Down
2 changes: 2 additions & 0 deletions editor/sidebar/post-schedule/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class PostSchedule extends Component {
const handleChange = ( newDate ) => {
onUpdateDate( newDate.format( 'YYYY-MM-DDTHH:mm:ss' ) );
};
const is12HourTime = settings.formats.time.indexOf( 'a' ) !== -1 || settings.formats.time.indexOf( 'A' ) !== -1;
Copy link
Member

@aduth aduth May 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be inaccurate because it's possible to escape characters in the format. In other words, 'H:i:s \a\w\e\s\o\m\e' is not twelve hour time, but this logic would treat it as though it were.

Also, it could be simpler to force to lower/upper and test index of the one instance of 'a'/'A'.

Accounting for escaping could be tricky, particularly since JavaScript doesn't support lookbehind regular expression patterns. Dunno if there's a better way, but "flipping" the string and doing a look ahead is one option:

/a(?!\\)/i.test( 'h:i:s a'.split( '' ).reverse().join( '' ) )
// true
/a(?!\\)/i.test( 'h:i:s A'.split( '' ).reverse().join( '' ) )
// true
/a(?!\\)/i.test( 'H:i:s \\a\\w\\e\\s\\o\\m\\e'.split( '' ).reverse().join( '' ) )
// false

Copy link
Contributor Author

@youknowriad youknowriad May 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even this solution is not perfect because this \\\\\a is a 12 hour time but the test returns false

Copy link
Contributor Author

@youknowriad youknowriad May 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is the right test /a(?!\\)/i.test( '\\\\\\\\a'.replace(/\\\\/g).split( '' ).reverse().join( '' ) )

return (
<div className="editor-post-schedule">
<span>{ __( 'Publish' ) }</span>
Expand All @@ -68,6 +69,7 @@ class PostSchedule extends Component {
<PostScheduleClock
selected={ momentDate }
onChange={ handleChange }
is12Hour={ is12HourTime }
/>
</div>
}
Expand Down