Skip to content
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.

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

Extra Sidebar Widgets: update Twitter Timeline for sane limit #6021

Merged
merged 2 commits into from
Jan 27, 2017

Conversation

lancewillett
Copy link
Contributor

Syncs (part of) r148193-wpcom

Changes proposed in this Pull Request:

Update the labeling of this widget to be obvious about 1 - 20 range of tweets for the widget display.

Testing instructions:

  • Enable the Twitter Timeline widget.
  • Check the form to make sure the # of Tweets Shown (1 to 20): text appears.
  • Try adding more than 20; the form should reset back to 20 upon save.

Note: There is no lower limit. If empty Twitter decides the limit.

@lancewillett lancewillett added [Feature] Extra Sidebar Widgets [Status] Tested on WP.com [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it labels Dec 30, 2016
@lancewillett lancewillett added the [Status] Needs Review This PR is ready for review. label Dec 30, 2016
@niallkennedy
Copy link
Contributor

This diff matches the behavior of Twitter's oEmbed servers when receiving a limit query parameter out of supported range: the top accepted value in the range is returned in the data-tweet-limit attribute.

Example:
https://publish.twitter.com/oembed?/oembed?url=https%3A%2F%2Ftwitter.com%2FWordPress&limit=42

The range was already present in the input[type=number] min and max values. This diff adds server-side enforcement of that communicated range.

Code style of the diff varies slightly from the width range style:

$instance['width'] = min( max( $width, 220 ), 1200 );

or height:

$instance['height'] = max( $height, 200 );

vs. int conversion and a value exceeding the top of the range but no comparison of the bottom. Accepting 0, -1, etc?

Possible enhancement: a timeline with a specified limit is expanded to the height of those Tweets; the specified height value no longer applies. In my code I reject the height value when a valid limit is set: a widget attempting to save both limit 5 and height 400 would be saved with just limit 5.

@jeherve jeherve added this to the 4.6 milestone Jan 9, 2017
@jeherve jeherve added [Status] In Progress [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. and removed [Status] Needs Review This PR is ready for review. labels Jan 9, 2017
@lancewillett
Copy link
Contributor Author

Good ideas for improvement, @niallkennedy — thanks. I'll refresh this pull with a minimum value check and int conversion of width/height values.

Possible enhancement: a timeline with a specified limit is expanded to the height of those Tweets; the specified height value no longer applies. In my code I reject the height value when a valid limit is set: a widget attempting to save both limit 5 and height 400 would be saved with just limit 5.

That's a great idea, too. Cheers.

@lancewillett lancewillett added [Status] Needs Review This PR is ready for review. and removed [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. labels Jan 10, 2017
@lancewillett
Copy link
Contributor Author

Made the suggested changes - ready for more review and testing.

@niallkennedy
Copy link
Contributor

looks good, thanks

@lancewillett
Copy link
Contributor Author

@eliorivero Can you take a look, test, and merge?

@eliorivero
Copy link
Contributor

eliorivero commented Jan 27, 2017

LGTM!
Tested in Customizer and WP Admin, all good.
Merging as requested.

@eliorivero eliorivero merged commit f76d6bf into master Jan 27, 2017
@eliorivero eliorivero deleted the update/twitter-timeline-tweet-limit branch January 27, 2017 13:51
@jeherve jeherve modified the milestones: 2/17 - February, 4.5.1 Jan 30, 2017
@jeherve jeherve modified the milestones: 2/17 - February, 4.5.1 Jan 30, 2017
jeherve added a commit that referenced this pull request Feb 1, 2017
dereksmart pushed a commit that referenced this pull request Feb 2, 2017
* Changelog: move 4.5 changelog to changelog.txt

* Changelog: add #5603

* Changelog: add #6242

* Changelog: add #6104

* Changelog: add #6109

* Changelog: add #6118

* Changelog: adf #6122

* Changelog: add #6115

* Changelog: add #6126

* Changelog: add #6131

* Changelog: add #6140

* Testing list: add testing instructions for Widget fixes.

* Changelog: add #6142

* Changelog: add #6149

* Changelog: add #6151

* Changelog: add #6153

* Changelog: add #6154

* Changelog: add #6155

* Changelog: add #6158

* Changelog: add #6170

* Changelog: add #6182

* Changelog: add #6183

* Changelog: add #5821

* Changelog: add #5953

* Changelog: add #5988

* Changelog: add #6002

* Changelog: add #6021

* Changelog: add #6038

* Changelog: add #6040

* Changelog: add #6060

* Changelog: add #6068

* Changelog: add #6083

* Changelog: add #6098

* Changelog: add #6186

* Testing list: add Publicize instructions.

* Changelog: add #6190

* Changelog: add #6194

* Changelog: add #6230

* Changelog: add #6232

* Changelog: add #6234

* Testing list: add instructions to test Woo JITM.

* Testing list: add PHP 7.1 testing.

* Testing list: add compat tests for widgets and shortcodes.

* Testing list: add wpcom REST API testing.

* Missing word in testing list.
dereksmart pushed a commit that referenced this pull request Feb 2, 2017
* Changelog: move 4.5 changelog to changelog.txt

* Changelog: add #5603

* Changelog: add #6242

* Changelog: add #6104

* Changelog: add #6109

* Changelog: add #6118

* Changelog: adf #6122

* Changelog: add #6115

* Changelog: add #6126

* Changelog: add #6131

* Changelog: add #6140

* Testing list: add testing instructions for Widget fixes.

* Changelog: add #6142

* Changelog: add #6149

* Changelog: add #6151

* Changelog: add #6153

* Changelog: add #6154

* Changelog: add #6155

* Changelog: add #6158

* Changelog: add #6170

* Changelog: add #6182

* Changelog: add #6183

* Changelog: add #5821

* Changelog: add #5953

* Changelog: add #5988

* Changelog: add #6002

* Changelog: add #6021

* Changelog: add #6038

* Changelog: add #6040

* Changelog: add #6060

* Changelog: add #6068

* Changelog: add #6083

* Changelog: add #6098

* Changelog: add #6186

* Testing list: add Publicize instructions.

* Changelog: add #6190

* Changelog: add #6194

* Changelog: add #6230

* Changelog: add #6232

* Changelog: add #6234

* Testing list: add instructions to test Woo JITM.

* Testing list: add PHP 7.1 testing.

* Testing list: add compat tests for widgets and shortcodes.

* Testing list: add wpcom REST API testing.

* Missing word in testing list.
samhotchkiss pushed a commit that referenced this pull request Feb 10, 2017
* update google analytics description (#6250)

* Add user tracking for disconnecting site (#6248)

* Minor whitespace cleanups

* Changelog and Testing list for Jetpack 4.6 (#6245)

* Changelog: move 4.5 changelog to changelog.txt

* Changelog: add #5603

* Changelog: add #6242

* Changelog: add #6104

* Changelog: add #6109

* Changelog: add #6118

* Changelog: adf #6122

* Changelog: add #6115

* Changelog: add #6126

* Changelog: add #6131

* Changelog: add #6140

* Testing list: add testing instructions for Widget fixes.

* Changelog: add #6142

* Changelog: add #6149

* Changelog: add #6151

* Changelog: add #6153

* Changelog: add #6154

* Changelog: add #6155

* Changelog: add #6158

* Changelog: add #6170

* Changelog: add #6182

* Changelog: add #6183

* Changelog: add #5821

* Changelog: add #5953

* Changelog: add #5988

* Changelog: add #6002

* Changelog: add #6021

* Changelog: add #6038

* Changelog: add #6040

* Changelog: add #6060

* Changelog: add #6068

* Changelog: add #6083

* Changelog: add #6098

* Changelog: add #6186

* Testing list: add Publicize instructions.

* Changelog: add #6190

* Changelog: add #6194

* Changelog: add #6230

* Changelog: add #6232

* Changelog: add #6234

* Testing list: add instructions to test Woo JITM.

* Testing list: add PHP 7.1 testing.

* Testing list: add compat tests for widgets and shortcodes.

* Testing list: add wpcom REST API testing.

* Missing word in testing list.

* generate new module headers (#6264)

* Tracks: don't track during CI runs

* WPCOM MERGE Infinite Scroll (#6246)

* VIP: Query errors generated for HoopsHype are caused by the infinite scroll functionality. This filter will allow to use rewrite rules so that the infinity functions can be called by rewrite rules that will be cached by batcache.

Merges r120201-wpcom.

* Infinite Scroll: only disable in the Customizer when previewing a non-active theme.

Fixes #7507
See [115743] #6795

Merges r122634-wpcom.

* Infinite Scroll: allow `get_settings` to be filtered at later points than just `__construct`. See #7539.

Merges r123819-wpcom.

* Infinite Scroll: add translation function to credit line.

Merges #2537
Fixes #2528

https://[private link]

Merges r132540-wpcom.

* Infinite Scroll: fix IS when content includes Curly Quotes (and other non-UTF8 chars)

Using wp_json_encode instead of json_encode allowing us to replace invalid chars with HTML entities.

Merges #1447
Fixes #1446
props jtsternberg

https://[private link]

Merges r132541-wpcom.

* Infinite Scroll: add check on ob_end_clean for cases where output_buffering is disabled

Merges #2545
Props drrobotnik

https://[private link]

Merges r132542-wpcom.

* Infinite Scroll: check that search terms exist before matching against post title.

Merges #2128
Fixes #2075
Props cainm

https://[private link]

Merges r132543-wpcom.

* Infinite Scroll: Fatal error when calling protected method from WP_Query

Since we already have wp_query() we can use its query_vars['search_terms'] property instead of calling parse_search_terms().
It gets populated on https://github.com/WordPress/WordPress/blob/4.3.1/wp-includes/query.php#L2075 with the same data.

Merges #2827
Fixes #2255
Props osiux

https://[private link]

Merges r132544-wpcom.

* Infinite Scroll: Hide infinite-scroll class if the option is disabled

The Jetpack support page says that the infinite-scroll class should be used in a theme to hide the navigation links.
However, even when disabled in the Reading page, the class is still visible and the CSS is applied just as if the scroll is enabled.

This commit adds an option check before filtering the body_class classes.

Merges #1208
Props mpeshev

https://[private link]

Merges r132546-wpcom.

* Infinite Scroll: Don't clobber the posts_per_page option if provided

Infinite Scroll currently clobbers any passed-in value for posts_per_page if the type is set to click.
This commit changes the behavior to match the documentation:
https://jetpack.me/support/infinite-scroll/

Merges #2808
Props codebykat

https://[private link]

Merges r132547-wpcom.

* Infinite Scroll: document all filter and action hooks

Merges #2852

https://[private link]

Merges r132551-wpcom.

* Infinite Scroll: favor user set settings over theme settings

If user changed their posts_per_page option, use that in Infinite Scroll instead of the value set in theme's IS support declaration.
Only true when IS is set to click.

Related: r132547
Discussion: https://[private link]#comment-31306

Merges r132764-wpcom.

* Infinite Scroll: Merge changes from Jetpack into wpcom

Just removing some whitespace so the 2 files are exactly similar and do not trigger the build script anymore.

Merges r132787-wpcom.

* Infinite Scroll: Make sure the body class gets updated once we are done with IS even when we just click

Merges r134572-wpcom.

* Remove `target="_blank"` from internal link.

Accidentally added by #3600, which was intended to add only to external links.

* JSON API: Removes PHP notice when no taxonomy description provided

Fixes #4424

* JSON API: Removes PHP notice when no term description provided

Fixes: #5943

* Google Analytics: hook tracking code into wp_footer. (#6284)

get_footer might not be compatible with every theme out there.

* Google Analytics: add HTML comment before the script output. (#6288)

* Sync: Return expected response on Jetpack side

* GA: Update inactive description to match calypso (#6291)

* lodash: import specific function (#6295)

* Change Infinite Scroll Google Analytics option label (#6239)

* Sync: Fixes an issue where sync_wait_time was immediately overwritten in sync sender (#6281)

* Documentation: reorganize current docs and create new ones. (#5985)

* Documentation: reorganize current docs and create new ones.

- Make contributing less frightening and easier for all potential contributors.
- Make our guidelines and requirements clearer.
- Surface all data in our contributing guide.
- Offer options to contribute to everyone, even if it's not via code.
- Outline our release management process, and approach to code reviews and Pull Requests.

* Documentation: fix typos, headings, wrong links.

* Add PHPCS and ESLint to the development environment documentation.

* Docs: include some information about PHP Unit Testing.

Fixes #6236

* Docs: add "Development" section.

@see #5985 (comment)

* update languages (#6302)

* Bump version to 4.7-alpha (#6301)

* Fix: Use the site_icon id instead of the url (#6303)

When $image_url is set to a photon image we are not able to deremine
the $image_id. Instead we should use the option that stores the ID
instead.

This fixes the issue when we show the default image instead of the
site icon as the open graph main image. When photon is enabled and the
site icon is set.

* Add unit test for Publicize (#6018)

* Add the accessible-focus library from dops-components to enable keyboard focus styles (#6300)

* Use shorter WooCommerce Services MC stat slug.

* Track WooCommerce services install as a module activation, not a WPCOM tools event.

* Track WooCommerce Services JITM click and activation separately.

* Update printThis to v1.9.0 (#6263)

* Update to printThis v1.9

Additional options, including:
* base tag
* preservation of form values
* doctype
* canvas (experimental)
* Additional cleanup

* Added jshint

* Date update

Update date for `wp_enqueue_script` for printThis to prevent caching issues

* Add filter for WordPress Posts widget content

* Replace esc_html_e with esc_html__. Change the initialization of .

* Don't call site_url() twice

Instead of calling the function twice, which is a waste, assign the
value to a variable and use that value to check whether we're on a
tld-less domain or not.

* Upgrades yarn lock file and fixes builds for master branch. (#6309)

* Fixing a problem with local import.

* Running yarn upgrade.

* Added the print this library to jshint ignore.

* Added a new generated RTL CSS file.

* Changelog: update for release (#6280)

* Changelog: add release post link.

* Improved the changelog for readability and understanding

* some minor adjustments were made to wording and to eliminate errors

* Fix typos

* update SSO changelog entry verbiage

* changelogs edits per sdquirk

* Adds vscode dir to ignore

Visual Studio Code can store per-project settings in a .vscode folder;
this updates .gitignore to ignore that, since it shouldn't be checked
in.

* Follow Widget: load translation files using wpcom language codes. (#5941)

* Follow Widget: load translation files using wpcom language codes.

Related: #2698

The widget previously used the site's language code to populate the `data-lang` parameter.
that parameter is used to grab language files from WordPress.com, and should consequently use a language code that's available on
WordPress.com.

We consequently use the data available in locales.php to use the `slug` language code instead of `wp_locale` for each language.

* Follow Widget / Notes: avoid calling get_locale() twice.

It's been called before on the file.

@see #5941 (review)

* Remove Jetpack_Network::wp_get_sites in favor of core's wp_get_sites (#3405)

* Removes Jetpack_Network::wp_get_sites and uses core's wp_get_sites instead.

Changes usages of returned array since the one in Jetpack returned an array of objects and the one in core returns an array of arrays.
Call to wp_get_sites has offset set to 1 to dismiss the first site since Function in Jetpack excluded the first site as well.

* Make strings available for translation.

* Use get_sites() instead of deprecated wp_get_sites()

* Escape URLs in network admin, even though they are presumed safe

* Network: introduce get_current_blog_id() when discarding the main site from sites table

* Holiday Snow: remove settings outside of Holiday Snow period (#6298)

* Only show holiday snow option 1 week before, through to 1 week after holiday snow period. Always show holiday snow option if custom rules have been set for holiday snow period.

* Disable holiday snow option on Jan 4; not Jan 11

* Don't use Initial_State to fetch holiday snow option visibility

* Media Summary: improve performance with single page load caching (#5938)

* improve Jetpack_Media_Summary performance by caching result for a single pageload

* spacing

* no need to md5, also set cache to private

* Remove unnecessary error_log (#6318)

* Improve translatability of plurals and texts with variables (#6307)

* Make gettext call plural aware
* Add translator comments and convert plural strings

* Slideshow: add filter to customize speed of the Slideshow.

Suggested in https://wordpress.org/support/topic/gallery-slideshow-settings-editable-somehow

* Slideshow: bump js version to bust cache.

* Slideshow: use the timeout param instead of speed

@see http://jquery.malsup.com/cycle/options.html

* Slideshow shortcode: update version number in docblock.

* Replace text labels with x and + icons.

* Fix bug where wrong xmlrpc url was being sent to Jetpack Debugger (#6321)

* Ignore GET parameters when checking an image's original file url matches container href (#6296)

* Add email field to Contact Info Widget (#6275)

* Add email field to Contact Info Widget

* Replace admin email with sample email. Validate email and remove link if it is not

* Display nothing when the email check fails

* Remove email default value

* Remove PHP error on uninstall, by making sure that jetpack includes all the required files (#6320)

* Add image caching to jetpack_og_get_image() (#6297)

* Add image caching to jetpack_og_get_image()

This adds a transient to store the value of the $image_id to "speed up"  the function to fix #6017

* Added missing semicolons at EOL on a couple lines

* Adding some whitespace per coding standards

* upgrade yarn.lock
georgestephanis pushed a commit that referenced this pull request Mar 22, 2017
…ght values.

Per recommendations by Niall Kennedy: #6021 (comment)

 * When a valid tweet limit is set, ignore the user given height.
 * Properly validate the integer value of tweet limit.

See r148240 and Automattic/customization#74

Merges r148835-wpcom.
samhotchkiss pushed a commit that referenced this pull request Mar 28, 2017
* Widgets: Facebook Like Box: Fallback to WordPress locale or English for unknown locale

See: r117058
See: https://[private link]

Merges r120105-wpcom.

* Facebook Like Box Widget: Restore 'width' option to support widget areas wider than 340px.

We recently removed the width option from this widget in order to allow it to be responsive. However, it defaults to 340px at largest, which is a problem for wider widget areas.

This is a partial revert of r119494-wpcom.

https://[private link]
ed2c2a9
https://[private link]#comment-33575

Merges r121114-wpcom.

* Widgets: Facebook Page Plugin: Update the wp-admin strings for "Like Box" to read "Page Plugin" instead, since the code now loads the Facebook page plugin code instead.

Merges r123111-wpcom.

* Widgets: rename `widget` pageview stat to something more useful: `widget_view`, see #7805.

Merges r144861-wpcom.

* Widgets: minor code and comments cleanup in Facebook Page Plugin.

See #6421.

Merges r148069-wpcom.

* Widgets: Facebook Page Plugin: better UX for min/max height and width values.

Fixes https://github.com/Automattic/customization/issues/53

Merges r148071-wpcom.

* Widgets: more attribute escaping for Facebook Page Plugin widget.

See r148071.

Merges r148072-wpcom.

* Widgets: add pageview tracking to more active WP.com widgets, see #7805.

Merges r144867-wpcom.

* Widgets: minor documentation fixes, code style for Google Translate widget.

See #7805

Merges r145017-wpcom.

* Widgets: rename `widget` pageview stat to something more useful: `widget_view`, see #7805.

Merges r144861-wpcom.

* Widgets: sync stats bumps with latest Jetpack changes.

See #5488

Merges r144995-wpcom.

* Widgets: add pageview tracking to more active WP.com widgets, see #7805.

Merges r144867-wpcom.

* Widgets: fix a few Jetpack stats bumps, see #7805.

Ref: #5488

Merges r144925-wpcom.

* Widgets: sync stats bumps with latest Jetpack changes.

See #5488

Merges r144995-wpcom.

* Widgets: minor documentation fixes, code style for Google Translate widget.

See #7805

Merges r145017-wpcom.

* Widgets: add Flickr to the services available in the Social Media Icons widget.

See #5156

Merges r148065-wpcom.

* Widgets: add pageview tracking to more active WP.com widgets, see #7805.

Merges r144867-wpcom.

* Widgets: sync stats bumps with latest Jetpack changes.

See #5488

Merges r144995-wpcom.

* Widgets: fix grid layout for Top Posts and Pages to show correct avatar fallback image size of 200 pixels square.

FIxes #6664.

Merges r148090-wpcom.

* Widgets: Update URL to create a Twitter widget

This is just a stopgap until we can fully integrate with the new
publish.twitter.com setup.  See https://github.com/Automattic/io/issues/601 for
more info.

Merges r137075-wpcom.

* Widgets: Update Twitter Timeline to not require a widget ID

https://[private link]

Merges r137600-wpcom.

* Widgets: Twitter Timeline: Use data-width= instead of width=

Same for height, and a couple of other cleanups.  See:

#3283

Merges r137659-wpcom.

* Widgets: Twitter Timeline: Fix a PHP notice

From review at #4198

Merges r137943-wpcom.

* Widgets: rename `widget` pageview stat to something more useful: `widget_view`, see #7805.

Merges r144861-wpcom.

* Widgets: fix a few Jetpack stats bumps, see #7805.

Ref: #5488

Merges r144925-wpcom.

* Widgets: sync stats bumps with latest Jetpack changes.

See #5488

Merges r144995-wpcom.

* Widgets: fix Twitter Timeline height (not used any more) and set maximum number of tweets to 20.

Fixes https://github.com/Automattic/customization/issues/74

Merges r148193-wpcom.

* Widgets: still honor Twitter Timeline 'height' value if it was previously set.

See r148193 and https://github.com/Automattic/customization/issues/74

However, Twitter might not honor it.

Merges r148239-wpcom.

* Widgets: revert the height changes to Twitter Timeline in r148193.

Needs more investigation on why they are ignored by Twitter's embed.

See https://github.com/Automattic/customization/issues/74

Merges r148240-wpcom.

* Widgets: further improvements to Twitter Timeline tweet limit and height values.

Per recommendations by Niall Kennedy: #6021 (comment)

 * When a valid tweet limit is set, ignore the user given height.
 * Properly validate the integer value of tweet limit.

See r148240 and https://github.com/Automattic/customization/issues/74

Merges r148835-wpcom.

* Apply timezone offsets to the upcomingevents shortcode

This patch adds changes to the calendar shortcode so that it applies a users timezone to all of the rendered events

See https://[private link]
Differential Revision: https://[private link]

Merges r151822-wpcom.

* Apply timezone offsets to the upcomingevents shortcode

This patch adds changes to the calendar shortcode so that it applies a users timezone to all of the rendered events

See https://[private link]
Differential Revision: https://[private link]

Merges r151822-wpcom.

* Fix calendar reader timezone offsets

This revision aims at fixing an issue in the `iCalendarReader` class
The function that applies timezone offsets calculates the time difference for timezones using the current date instead of the date thats actually associated with the event. This leads to Daylight Savings Time confusions if today is standard time and the event occurs in daylight savings time. Today (3-8-2017) an event for 3-15-2017 6:30pm will show up as 3-15-2017 5:30pm

For effected users see:
  - https://[private link]
  - https://[private link]
  - https://[private link]

Merges r152463-wpcom.

* Remove duplicated method.

Must have been a merge gone bad.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants