enmi-conf.org: comparison wp/wp-includes/js/media-editor.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/media-editor.js

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 			attrs[ key ] = false;
 		}
 		return attrs[ key ];
 	};
-	/**
+	/** @namespace wp.media.string */
-	 * wp.media.string
-	 * @namespace
-	 */
 	wp.media.string = {
 		/**
 		 * Joins the `props` and `attachment` objects,
 		 * outputting the proper object format based on the
 		 * attachment's type.
 		 *
-		 * @global wp.media.view.settings
-		 * @global getUserSetting()
-		 *
 		 * @param {Object} [props={}] Attachment details (align, link, size, etc).
 		 * @param {Object} attachment The attachment object, media version of Post.
 		 * @returns {Object} Joined props
 		 */
 		props: function( props, attachment ) {
-			var link, linkUrl, size, sizes, fallbacks,
+			var link, linkUrl, size, sizes,
 				defaultProps = wp.media.view.settings.defaultProps;
-			// Final fallbacks run after all processing has been completed.
-			fallbacks = function( props ) {
-				// Generate alt fallbacks and strip tags.
-				if ( 'image' === props.type && ! props.alt ) {
-					props.alt = props.caption || props.title || '';
-					props.alt = props.alt.replace( /<\/?[^>]+>/g, '' );
-					props.alt = props.alt.replace( /[\r\n]+/g, ' ' );
-				}
-				return props;
-			};
 			props = props ? _.clone( props ) : {};
 			if ( attachment && attachment.type ) {
 				props.type = attachment.type;
 				});
 			}
 			// All attachment-specific settings follow.
 			if ( ! attachment ) {
-				return fallbacks( props );
+				return props;
 			}
 			props.title = props.title || attachment.title;
 			link = props.link || defaultProps.link || getUserSetting( 'urlbutton', 'file' );
 			} else {
 				props.title = props.title || attachment.filename;
 				props.rel = props.rel || 'attachment wp-att-' + attachment.id;
 			}
-			return fallbacks( props );
+			return props;
 		},
 		/**
 		 * Create link markup that is suitable for passing to the editor
-		 *
-		 * @global wp.html.string
 		 *
 		 * @param {Object} props Attachment details (align, link, size, etc).
 		 * @param {Object} attachment The attachment object, media version of Post.
 		 * @returns {string} The link markup
 		 */
 		/**
 		 * Helper function to create a media shortcode string
 		 *
 		 * @access private
 		 *
-		 * @global wp.shortcode
-		 * @global wp.media.view.settings
-		 *
 		 * @param {string} type The shortcode tag name: 'audio' or 'video'.
 		 * @param {Object} props Attachment details (align, link, size, etc).
 		 * @param {Object} attachment The attachment object, media version of Post.
 		 * @returns {string} The media shortcode
 		 */
 		},
 		/**
 		 * Create image markup, optionally with a link and/or wrapped in a caption shortcode,
 		 *  that is suitable for passing to the editor
 		 *
-		 * @global wp.html
-		 * @global wp.shortcode
-		 *
 		 * @param {Object} props Attachment details (align, link, size, etc).
 		 * @param {Object} attachment The attachment object, media version of Post.
 		 * @returns {string}
 		 */
 		image: function( props, attachment ) {
 			var img = {},
 				options, classes, shortcode, html;
+			props.type = 'image';
 			props = wp.media.string.props( props, attachment );
 			classes = props.classes || [];
 			img.src = ! _.isUndefined( attachment ) ? attachment.url : props.url;
 			_.extend( img, _.pick( props, 'width', 'height', 'alt' ) );
 				content: content
 			});
 		}
 	};
+	/**
+	 * @class wp.media.collection
+	 *
+	 * @param {Object} attributes
+	 */
 	wp.media.collection = function(attributes) {
 		var collections = {};
-		return _.extend( {
+		return _.extend(/** @lends wp.media.collection.prototype */{
 			coerce : wp.media.coerce,
 			/**
 			 * Retrieve attachments based on the properties of the passed shortcode
-			 *
-			 * @global wp.media.query
 			 *
 			 * @param {wp.shortcode} shortcode An instance of wp.shortcode().
 			 * @returns {wp.media.model.Attachments} A Backbone.Collection containing
 			 *      the media items belonging to a collection.
 			 *      The query[ this.tag ] property is a Backbone.Model
 				return query;
 			},
 			/**
 			 * Triggered when clicking 'Insert {label}' or 'Update {label}'
 			 *
-			 * @global wp.shortcode
-			 * @global wp.media.model.Attachments
-			 *
 			 * @param {wp.media.model.Attachments} attachments A Backbone.Collection containing
 			 *      the media items belonging to a collection.
 			 *      The query[ this.tag ] property is a Backbone.Model
 			 *          containing the 'props' for the collection.
 			 * @returns {wp.shortcode}
 				return shortcode;
 			},
 			/**
 			 * Triggered when double-clicking a collection shortcode placeholder
 			 *   in the editor
-			 *
-			 * @global wp.shortcode
-			 * @global wp.media.model.Selection
-			 * @global wp.media.view.l10n
 			 *
 			 * @param {string} content Content that is searched for possible
 			 *    shortcode markup matching the passed tag name,
 			 *
 			 * @this wp.media.{prop}
 			return attrs;
 		}
 	});
 	/**
-	 * wp.media.featuredImage
+	 * @namespace wp.media.featuredImage
-	 * @namespace
+	 * @memberOf wp.media
 	 */
 	wp.media.featuredImage = {
 		/**
 		 * Get the featured image post ID
 		 *
-		 * @global wp.media.view.settings
-		 *
 		 * @returns {wp.media.view.settings.post.featuredImageId|number}
 		 */
 		get: function() {
 			return wp.media.view.settings.post.featuredImageId;
 		},
 		/**
 		 * Set the featured image id, save the post thumbnail data and
 		 * set the HTML in the post meta box to the new featured image.
 		 *
-		 * @global wp.media.view.settings
-		 * @global wp.media.post
-		 *
 		 * @param {number} id The post ID of the featured image, or -1 to unset it.
 		 */
 		set: function( id ) {
 			var settings = wp.media.view.settings;
 			settings.post.featuredImageId = id;
-			wp.media.post( 'set-post-thumbnail', {
+			wp.media.post( 'get-post-thumbnail-html', {
-				json:         true,
 				post_id:      settings.post.id,
 				thumbnail_id: settings.post.featuredImageId,
 				_wpnonce:     settings.post.nonce
 			}).done( function( html ) {
+				if ( html == '0' ) {
+					window.alert( window.setPostThumbnailL10n.error );
+					return;
+				}
 				$( '.inside', '#postimagediv' ).html( html );
 			});
 		},
 		/**
+		 * Remove the featured image id, save the post thumbnail data and
+		 * set the HTML in the post meta box to no featured image.
+		 */
+		remove: function() {
+			wp.media.featuredImage.set( -1 );
+		},
+		/**
 		 * The Featured Image workflow
-		 *
-		 * @global wp.media.controller.FeaturedImage
-		 * @global wp.media.view.l10n
 		 *
 		 * @this wp.media.featuredImage
 		 *
 		 * @returns {wp.media.view.MediaFrame.Select} A media workflow.
 		 */
 		frame: function() {
 			if ( this._frame ) {
+				wp.media.frame = this._frame;
 				return this._frame;
 			}
 			this._frame = wp.media({
 				state: 'featured-image',
 		},
 		/**
 		 * 'select' callback for Featured Image workflow, triggered when
 		 *  the 'Set Featured Image' button is clicked in the media modal.
 		 *
-		 * @global wp.media.view.settings
-		 *
 		 * @this wp.media.controller.FeaturedImage
 		 */
 		select: function() {
 			var selection = this.get('selection').single();
 		/**
 		 * Open the content media manager to the 'featured image' tab when
 		 * the post thumbnail is clicked.
 		 *
 		 * Update the featured image id when the 'remove' link is clicked.
-		 *
-		 * @global wp.media.view.settings
 		 */
 		init: function() {
 			$('#postimagediv').on( 'click', '#set-post-thumbnail', function( event ) {
 				event.preventDefault();
 				// Stop propagation to prevent thickbox from activating.
 				event.stopPropagation();
 				wp.media.featuredImage.frame().open();
 			}).on( 'click', '#remove-post-thumbnail', function() {
-				wp.media.view.settings.post.featuredImageId = -1;
+				wp.media.featuredImage.remove();
+				return false;
 			});
 		}
 	};
 	$( wp.media.featuredImage.init );
-	/**
+	/** @namespace wp.media.editor */
-	 * wp.media.editor
-	 * @namespace
-	 */
 	wp.media.editor = {
 		/**
 		 * Send content to the editor
-		 *
-		 * @global tinymce
-		 * @global QTags
-		 * @global wpActiveEditor
-		 * @global tb_remove() - Possibly overloaded by legacy plugins
 		 *
 		 * @param {string} html Content to send to the editor
 		 */
 		insert: function( html ) {
 			var editor, wpActiveEditor,
 		},
 		/**
 		 * Setup 'workflow' and add to the 'workflows' cache. 'open' can
 		 *  subsequently be called upon it.
-		 *
-		 * @global wp.media.view.l10n
 		 *
 		 * @param {string} id A slug used to identify the workflow.
 		 * @param {Object} [options={}]
 		 *
 		 * @this wp.media.editor
 			return workflow;
 		},
 		/**
 		 * Determines the proper current workflow id
 		 *
-		 * @global wpActiveEditor
-		 * @global tinymce
-		 *
 		 * @param {string} [id=''] A slug used to identify the workflow.
 		 *
 		 * @returns {wpActiveEditor|string|tinymce.activeEditor.id}
 		 */
 		id: function( id ) {
 		 */
 		remove: function( id ) {
 			id = this.id( id );
 			delete workflows[ id ];
 		},
-		/**
+		/** @namespace wp.media.editor.send */
-		 * @namespace
-		 */
 		send: {
 			/**
 			 * Called when sending an attachment to the editor
 			 *   from the medial modal.
-			 *
-			 * @global wp.media.view.settings
-			 * @global wp.media.post
 			 *
 			 * @param {Object} props Attachment details (align, link, size, etc).
 			 * @param {Object} attachment The attachment object, media version of Post.
 			 * @returns {Promise}
 			 */
 				});
 			},
 			/**
 			 * Called when 'Insert From URL' source is not an image. Example: YouTube url.
 			 *
-			 * @global wp.media.view.settings
-			 *
 			 * @param {Object} embed
 			 * @returns {Promise}
 			 */
 			link: function( embed ) {
 				return wp.media.post( 'send-link-to-editor', {
 			// Redo workflow if state has changed
 			if ( ! workflow || ( workflow.options && options.state !== workflow.options.state ) ) {
 				workflow = this.add( id, options );
 			}
+			wp.media.frame = workflow;
 			return workflow.open();
 		},
 		/**
 		 * Bind click event for .insert-media using event delegation
-		 *
-		 * @global wp.media.view.l10n
 		 */
 		init: function() {
 			$(document.body)
 				.on( 'click.add-media-button', '.insert-media', function( event ) {
 					var elem = $( event.currentTarget ),
 							multiple: true
 						};
 					event.preventDefault();
-					// Remove focus from the `.insert-media` button.
-					// Prevents Opera from showing the outline of the button
-					// above the modal.
-					//
-					// See: https://core.trac.wordpress.org/ticket/22445
-					elem.blur();
 					if ( elem.hasClass( 'gallery' ) ) {
 						options.state = 'gallery';
 						options.title = wp.media.view.l10n.createGalleryTitle;
 					}

enmi-conf.org