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

Admin JS: after [34977], avoid variable names conflicts with `e`. 

Props afercia.
Fixes #18590.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-10-10 15:50:24 +00:00
parent 00ade45fd1
commit 5fdf928bcf
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/js/post.js
View File

@ -722,7 +722,7 @@ jQuery(document).ready( function($) {
// permalink // permalink
function editPermalink() { function editPermalink() {
var i, slug_value, var i, slug_value,
e, revert_e, $el, revert_e,
c = 0, c = 0,
real_slug = $('#post_name'), real_slug = $('#post_name'),
revert_slug = real_slug.val(), revert_slug = real_slug.val(),
@ -738,12 +738,12 @@ jQuery(document).ready( function($) {
full = full.html(); full = full.html();
permalink.html( permalinkInner ); permalink.html( permalinkInner );
e = $('#editable-post-name'); $el = $( '#editable-post-name' );
revert_e = e.html(); revert_e = $el.html();
buttons.html('<button type="button" class="save button button-small">'+postL10n.ok+'</button> <a class="cancel" href="#">'+postL10n.cancel+'</a>'); buttons.html('<button type="button" class="save button button-small">'+postL10n.ok+'</button> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
buttons.children('.save').click( function( e ) { buttons.children('.save').click( function( e ) {
var new_slug = e.children('input').val(); var new_slug = $el.children( 'input' ).val();
e.preventDefault(); e.preventDefault();
if ( new_slug == $('#editable-post-name-full').text() ) { if ( new_slug == $('#editable-post-name-full').text() ) {
buttons.children('.cancel').click(); buttons.children('.cancel').click();
@ -774,7 +774,7 @@ jQuery(document).ready( function($) {
buttons.children('.cancel').click( function( e ) { buttons.children('.cancel').click( function( e ) {
e.preventDefault(); e.preventDefault();
$('#view-post-btn').show(); $('#view-post-btn').show();
e.html(revert_e); $el.html(revert_e);
buttons.html(buttonsOrig); buttons.html(buttonsOrig);
permalink.html(permalinkOrig); permalink.html(permalinkOrig);
real_slug.val(revert_slug); real_slug.val(revert_slug);
@ -787,7 +787,7 @@ jQuery(document).ready( function($) {
} }
slug_value = ( c > full.length / 4 ) ? '' : full; slug_value = ( c > full.length / 4 ) ? '' : full;
e.html('<input type="text" id="new-post-slug" value="'+slug_value+'" autocomplete="off" />').children('input').keypress(function(e) { $el.html( '<input type="text" id="new-post-slug" value="'+slug_value+'" autocomplete="off" />').children('input').keypress(function(e) {
var key = e.keyCode || 0; var key = e.keyCode || 0;
// on enter, just save the new slug, don't save the post // on enter, just save the new slug, don't save the post
if ( 13 == key ) { if ( 13 == key ) {

2
wp-admin/js/post.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-35013'; $wp_version = '4.4-alpha-35014';
/** /**
* 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.