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

Media JS: ensure that `wp.media.frame` (a static reference to the "current" `Frame`) is reset when a cached frame is opened. 

Fixes #33458.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-17 00:10:26 +00:00
parent 444509e246
commit 6759f04a24
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -670,6 +670,7 @@
*/ */
frame: function() { frame: function() {
if ( this._frame ) { if ( this._frame ) {
wp.media.frame = this._frame;
return this._frame; return this._frame;
} }
@ -1067,6 +1068,8 @@
workflow = this.add( id, options ); workflow = this.add( id, options );
} }
wp.media.frame = workflow;
return workflow.open(); return workflow.open();
}, },

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

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34253'; $wp_version = '4.4-alpha-34254';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.