mirror of
git://develop.git.wordpress.org/
synced 2025-04-21 04:31:55 +02:00
External Libraries: Update minified version of jquery.masonry.js.
WordPress maintains the minified version of jquery.masonry.js since there is no official build, however it has been excluded from grunt's minification process. This adds a minification task to grunt, adds it to the precommit hook for JS, minifies the file, and bumps the version on jquery.masonry.min.js. The change to the non minified version was introduced in [38261]. Merge of [38276] and [38281] to the 4.6 branch. Fixes #37720. See #37666. git-svn-id: https://develop.svn.wordpress.org/branches/4.6@38339 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
95496a269a
commit
6d553e5ec3
10
Gruntfile.js
10
Gruntfile.js
@ -514,8 +514,17 @@ module.exports = function(grunt) {
|
||||
},
|
||||
src: SOURCE_DIR + 'wp-admin/js/bookmarklet.js',
|
||||
dest: SOURCE_DIR + 'wp-admin/js/bookmarklet.min.js'
|
||||
},
|
||||
masonry: {
|
||||
options: {
|
||||
// Preserve comments that start with a bang.
|
||||
preserveComments: /^!/
|
||||
},
|
||||
src: SOURCE_DIR + 'wp-includes/js/jquery/jquery.masonry.js',
|
||||
dest: SOURCE_DIR + 'wp-includes/js/jquery/jquery.masonry.min.js'
|
||||
}
|
||||
},
|
||||
|
||||
concat: {
|
||||
tinymce: {
|
||||
options: {
|
||||
@ -676,6 +685,7 @@ module.exports = function(grunt) {
|
||||
'browserify',
|
||||
'jshint:corejs',
|
||||
'uglify:bookmarklet',
|
||||
'uglify:masonry',
|
||||
'qunit:compiled'
|
||||
] );
|
||||
|
||||
|
22
src/wp-includes/js/jquery/jquery.masonry.min.js
vendored
22
src/wp-includes/js/jquery/jquery.masonry.min.js
vendored
@ -1,11 +1,11 @@
|
||||
-/*!
|
||||
- * Masonry v2 shim
|
||||
- * to maintain backwards compatibility
|
||||
- * as of Masonry v3.1.2
|
||||
- *
|
||||
- * Cascading grid layout library
|
||||
- * http://masonry.desandro.com
|
||||
- * MIT License
|
||||
- * by David DeSandro
|
||||
- */
|
||||
!function(a){"use strict";var b=a.Masonry;b.prototype._remapV2Options=function(){this._remapOption("gutterWidth","gutter"),this._remapOption("isResizable","isResizeBound"),this._remapOption("isRTL","isOriginLeft",function(a){return!a});var a=this.options.isAnimated;if(void 0!==a&&(this.options.transitionDuration=a?b.prototype.options.transitionDuration:0),void 0===a||a){var c=this.options.animationOptions,d=c&&c.duration;d&&(this.options.transitionDuration="string"==typeof d?d:d+"ms")}},b.prototype._remapOption=function(a,b,c){var d=this.options[a];void 0!==d&&(this.options[b]=c?c(d):d)};var c=b.prototype._create;b.prototype._create=function(){var a=this;this._remapV2Options(),c.apply(this,arguments),setTimeout(function(){jQuery(a.element).addClass("masonry")},0)};var d=b.prototype.layout;b.prototype.layout=function(){this._remapV2Options(),d.apply(this,arguments)};var e=b.prototype.option;b.prototype.option=function(){e.apply(this,arguments),this._remapV2Options()};var f=b.prototype._itemize;b.prototype._itemize=function(a){var b=f.apply(this,arguments);return jQuery(a).addClass("masonry-brick"),b};var g=b.prototype.measureColumns;b.prototype.measureColumns=function(){var a=this.options.columnWidth;a&&"function"==typeof a&&(this.getContainerWidth(),this.columnWidth=a(this.containerWidth)),g.apply(this,arguments)},b.prototype.reload=function(){this.reloadItems.apply(this,arguments),this.layout.apply(this)};var h=b.prototype.destroy;b.prototype.destroy=function(){var a=this.getItemElements();jQuery(this.element).removeClass("masonry"),jQuery(a).removeClass("masonry-brick"),h.apply(this,arguments)}}(window);
|
||||
/*!
|
||||
* Masonry v2 shim
|
||||
* to maintain backwards compatibility
|
||||
* as of Masonry v3.1.2
|
||||
*
|
||||
* Cascading grid layout library
|
||||
* http://masonry.desandro.com
|
||||
* MIT License
|
||||
* by David DeSandro
|
||||
*/
|
||||
!function(a){"use strict";var b=a.Masonry;b.prototype._remapV2Options=function(){this._remapOption("gutterWidth","gutter"),this._remapOption("isResizable","isResizeBound"),this._remapOption("isRTL","isOriginLeft",function(a){return!a});var a=this.options.isAnimated;if(void 0!==a&&(this.options.transitionDuration=a?this.options.transitionDuration:0),void 0===a||a){var b=this.options.animationOptions,c=b&&b.duration;c&&(this.options.transitionDuration="string"==typeof c?c:c+"ms")}},b.prototype._remapOption=function(a,b,c){var d=this.options[a];void 0!==d&&(this.options[b]=c?c(d):d)};var c=b.prototype._create;b.prototype._create=function(){var a=this;this._remapV2Options(),c.apply(this,arguments),setTimeout(function(){jQuery(a.element).addClass("masonry")},0)};var d=b.prototype.layout;b.prototype.layout=function(){this._remapV2Options(),d.apply(this,arguments)};var e=b.prototype.option;b.prototype.option=function(){e.apply(this,arguments),this._remapV2Options()};var f=b.prototype._itemize;b.prototype._itemize=function(a){var b=f.apply(this,arguments);return jQuery(a).addClass("masonry-brick"),b};var g=b.prototype.measureColumns;b.prototype.measureColumns=function(){var a=this.options.columnWidth;a&&"function"==typeof a&&(this.getContainerWidth(),this.columnWidth=a(this.containerWidth)),g.apply(this,arguments)},b.prototype.reload=function(){this.reloadItems.apply(this,arguments),this.layout.apply(this)};var h=b.prototype.destroy;b.prototype.destroy=function(){var a=this.getItemElements();jQuery(this.element).removeClass("masonry"),jQuery(a).removeClass("masonry-brick"),h.apply(this,arguments)}}(window);
|
@ -250,7 +250,7 @@ function wp_default_scripts( &$scripts ) {
|
||||
// It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
|
||||
$scripts->add( 'imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1 );
|
||||
$scripts->add( 'masonry', "/wp-includes/js/masonry.min.js", array( 'imagesloaded' ), '3.3.2', 1 );
|
||||
$scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2a', 1 );
|
||||
$scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2b', 1 );
|
||||
|
||||
$scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
|
||||
did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(
|
||||
|
Loading…
x
Reference in New Issue
Block a user