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

Editor: Fix JSHint errors after [41783]. 

See #42059.
Built from https://develop.svn.wordpress.org/trunk@41785


git-svn-id: http://core.svn.wordpress.org/trunk@41619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2017-10-06 19:12:49 +00:00
parent 20a3f8d6c9
commit 6ecdbe6e0e
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wp-admin/js/editor.js
View File

@ -101,10 +101,10 @@ window.wp = window.wp || {};
var keepSelection = false; var keepSelection = false;
if ( editor ) { if ( editor ) {
keepSelection = editor.getParam( 'wp_keep_scroll_position' ) keepSelection = editor.getParam( 'wp_keep_scroll_position' );
} else { } else {
keepSelection = window.tinyMCEPreInit.mceInit[ id ] && keepSelection = window.tinyMCEPreInit.mceInit[ id ] &&
window.tinyMCEPreInit.mceInit[ id ]['wp_keep_scroll_position'] window.tinyMCEPreInit.mceInit[ id ].wp_keep_scroll_position;
} }
if ( keepSelection ) { if ( keepSelection ) {
@ -321,7 +321,7 @@ window.wp = window.wp || {};
* @param {string} content The content we want to scan for shortcodes * @param {string} content The content we want to scan for shortcodes
*/ */
function getShortCodePositionsInText( content ) { function getShortCodePositionsInText( content ) {
var allShortcodes = getShortcodesInText( content ); var allShortcodes = getShortcodesInText( content ), shortcodeInfo;
if ( allShortcodes.length === 0 ) { if ( allShortcodes.length === 0 ) {
return []; return [];
@ -348,15 +348,16 @@ window.wp = window.wp || {};
* In addition, if the shortcode will get rendered as plain text ( see above ), * In addition, if the shortcode will get rendered as plain text ( see above ),
* we can treat it as text and use the selection markers in it. * we can treat it as text and use the selection markers in it.
*/ */
var isPreviewable = ! showAsPlainText && isShortcodePreviewable( shortcodeMatch[2] ), var isPreviewable = ! showAsPlainText && isShortcodePreviewable( shortcodeMatch[2] );
shortcodeInfo = {
shortcodeName: shortcodeMatch[2], shortcodeInfo = {
showAsPlainText: showAsPlainText, shortcodeName: shortcodeMatch[2],
startIndex: shortcodeMatch.index, showAsPlainText: showAsPlainText,
endIndex: shortcodeMatch.index + shortcodeMatch[0].length, startIndex: shortcodeMatch.index,
length: shortcodeMatch[0].length, endIndex: shortcodeMatch.index + shortcodeMatch[0].length,
isPreviewable: isPreviewable length: shortcodeMatch[0].length,
}; isPreviewable: isPreviewable
};
shortcodesDetails.push( shortcodeInfo ); shortcodesDetails.push( shortcodeInfo );
} }

2
wp-admin/js/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.9-beta1-41784'; $wp_version = '4.9-beta1-41785';
/** /**
* 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.