WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

We shall pledge to run `jshint` before committing. 

Props nacin for the nudge.


Built from https://develop.svn.wordpress.org/trunk@27435


git-svn-id: http://core.svn.wordpress.org/trunk@27282 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-03-06 16:06:14 +00:00
parent 944c629ace
commit bc9838f86f
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/js/media-editor.js
View File

@ -273,7 +273,7 @@
return html;
}
};
/**
* @mixin
*/
@ -584,13 +584,13 @@
shortcode : function (shortcode) {
var self = this;
_.each( wp.media.audio.defaults, function( value, key ) {
_.each( wp.media.audio.defaults, function( value, key ) {
shortcode[ key ] = self.coerce( shortcode, key );
if ( value === shortcode[ key ] ) {
delete shortcode[ key ];
if ( value === shortcode[ key ] ) {
delete shortcode[ key ];
}
});
});
return wp.shortcode.string({
tag: 'audio',
@ -628,13 +628,13 @@
shortcode : function (shortcode) {
var self = this;
_.each( wp.media.video.defaults, function( value, key ) {
_.each( wp.media.video.defaults, function( value, key ) {
shortcode[ key ] = self.coerce( shortcode, key );
if ( value === shortcode[ key ] ) {
delete shortcode[ key ];
if ( value === shortcode[ key ] ) {
delete shortcode[ key ];
}
});
});
return wp.shortcode.string({
tag: 'video',

8
wp-includes/js/media-models.js
View File

@ -457,12 +457,12 @@ window.wp = window.wp || {};
* @constructor
* @augments Backbone.Model
**/
PostAudio = media.model.PostAudio = Backbone.Model.extend({
media.model.PostAudio = Backbone.Model.extend({
initialize: function() {
this.attachment = false;
},
changeAttachment: function( attachment, props ) {
changeAttachment: function( attachment ) {
var self = this;
this.attachment = attachment;
@ -486,12 +486,12 @@ window.wp = window.wp || {};
* @constructor
* @augments Backbone.Model
**/
PostVideo = media.model.PostVideo = Backbone.Model.extend({
media.model.PostVideo = Backbone.Model.extend({
initialize: function() {
this.attachment = false;
},
changeAttachment: function( attachment, props ) {
changeAttachment: function( attachment ) {
var self = this;
this.attachment = attachment;

2
wp-includes/js/media-models.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
wp-includes/js/media-views.js
View File

@ -1,4 +1,5 @@
/* global _wpMediaViewsL10n, confirm, getUserSetting, setUserSetting */
/* global _wpMediaViewsL10n, _wpmejsSettings, MediaElementPlayer,
confirm, getUserSetting, setUserSetting */
(function($, _){
var media = wp.media, l10n;