enmi-conf.org: comparison wp/wp-admin/js/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-admin/js/editor.js

changeset 22	8c2e4d02f4ef
parent 21	48c4eec2b7e6

equal deleted inserted replaced

-:48c4eec2b7e6
+:8c2e4d02f4ef
 			if ( ! tinymce && window.tinymce ) {
 				tinymce = window.tinymce;
 				$$ = tinymce.$;
 				/**
-				 * Handles onclick events for the Visual/Text tabs.
+				 * Handles onclick events for the Visual/Code tabs.
 				 *
 				 * @since 4.3.0
 				 *
 				 * @return {void}
 				 */
 			return 30;
 		}
 		/**
-		 * Switches the editor between Visual and Text mode.
+		 * Switches the editor between Visual and Code mode.
 		 *
 		 * @since 2.5.0
 		 *
 		 * @memberof switchEditors
 		 *
 			mode = mode || 'toggle';
 			var editorHeight, toolbarHeight, iframe,
 				editor = tinymce.get( id ),
 				wrap = $$( '#wp-' + id + '-wrap' ),
+				htmlSwitch = wrap.find( '.switch-tmce' ),
+				tmceSwitch = wrap.find( '.switch-html' ),
 				$textarea = $$( '#' + id ),
 				textarea = $textarea[0];
 			if ( 'toggle' === mode ) {
 				if ( editor && ! editor.isHidden() ) {
 					window.QTags.closeAllTags( id );
 				}
 				editorHeight = parseInt( textarea.style.height, 10 ) || 0;
-				var keepSelection = false;
+				addHTMLBookmarkInTextAreaContent( $textarea );
-				if ( editor ) {
-					keepSelection = editor.getParam( 'wp_keep_scroll_position' );
-				} else {
-					keepSelection = window.tinyMCEPreInit.mceInit[ id ] &&
-									window.tinyMCEPreInit.mceInit[ id ].wp_keep_scroll_position;
-				}
-				if ( keepSelection ) {
-					// Save the selection.
-					addHTMLBookmarkInTextAreaContent( $textarea );
-				}
 				if ( editor ) {
 					editor.show();
 					// No point to resize the iframe in iOS.
 						if ( editorHeight > 50 && editorHeight < 5000 ) {
 							editor.theme.resizeTo( null, editorHeight );
 						}
 					}
-					if ( editor.getParam( 'wp_keep_scroll_position' ) ) {
+					focusHTMLBookmarkInVisualEditor( editor );
-						// Restore the selection.
-						focusHTMLBookmarkInVisualEditor( editor );
-					}
 				} else {
 					tinymce.init( window.tinyMCEPreInit.mceInit[ id ] );
 				}
 				wrap.removeClass( 'html-active' ).addClass( 'tmce-active' );
+				tmceSwitch.attr( 'aria-pressed', false );
+				htmlSwitch.attr( 'aria-pressed', true );
 				$textarea.attr( 'aria-hidden', true );
 				window.setUserSetting( 'editor', 'tinymce' );
 			} else if ( 'html' === mode ) {
 				// If the editor is hidden (Quicktags is shown) we don't need to switch.
 						}
 					}
 					var selectionRange = null;
-					if ( editor.getParam( 'wp_keep_scroll_position' ) ) {
+					selectionRange = findBookmarkedPosition( editor );
-						selectionRange = findBookmarkedPosition( editor );
-					}
 					editor.hide();
 					if ( selectionRange ) {
 						selectTextInTextArea( editor, selectionRange );
 					// The TinyMCE editor instance doesn't exist. Show the textarea.
 					$textarea.css({ 'display': '', 'visibility': '' });
 				}
 				wrap.removeClass( 'tmce-active' ).addClass( 'html-active' );
+				tmceSwitch.attr( 'aria-pressed', true );
+				htmlSwitch.attr( 'aria-pressed', false );
 				$textarea.attr( 'aria-hidden', false );
 				window.setUserSetting( 'editor', 'html' );
 			}
 		}
 		/**
 		 * Focuses the selection markers in Visual mode.
 		 *
 		 * The method checks for existing selection markers inside the editor DOM (Visual mode)
-		 * and create a selection between the two nodes using the DOM `createRange` selection API
+		 * and create a selection between the two nodes using the DOM `createRange` selection API.
 		 *
 		 * If there is only a single node, select only the single node through TinyMCE's selection API
 		 *
 		 * @param {Object} editor TinyMCE editor instance.
 		 */
 					editor.selection.setRng( selection );
 				}
 			}
-			if ( editor.getParam( 'wp_keep_scroll_position' ) ) {
+			scrollVisualModeToStartElement( editor, startNode );
-				scrollVisualModeToStartElement( editor, startNode );
-			}
 			removeSelectionMarker( startNode );
 			removeSelectionMarker( endNode );
 			editor.save();
 					textArea.focus();
 				}, 100 );
 			}
 		}
-		// Restore the selection when the editor is initialized. Needed when the Text editor is the default.
+		// Restore the selection when the editor is initialized. Needed when the Code editor is the default.
 		$( document ).on( 'tinymce-editor-init.keep-scroll-position', function( event, editor ) {
 			if ( editor.$( '.mce_SELRES_start' ).length ) {
 				focusHTMLBookmarkInVisualEditor( editor );
 			}
 		} );
 	window.switchEditors = new SwitchEditors();
 	/**
 	 * Initialize TinyMCE and/or Quicktags. For use with wp_enqueue_editor() (PHP).
 	 *
-	 * Intended for use with an existing textarea that will become the Text editor tab.
+	 * Intended for use with an existing textarea that will become the Code editor tab.
 	 * The editor width will be the width of the textarea container, height will be adjustable.
 	 *
 	 * Settings for both TinyMCE and Quicktags can be passed on initialization, and are "filtered"
 	 * with custom jQuery events on the document element, wp-before-tinymce-init and wp-before-quicktags-init.
 	 *
 			settings = {
 				tinymce: true
 			};
 		}
-		// Add wrap and the Visual|Text tabs.
+		// Add wrap and the Visual|Code tabs.
 		if ( settings.tinymce && settings.quicktags ) {
 			var $textarea = $( '#' + id );
 			var $wrap = $( '<div>' ).attr( {
 					'class': 'wp-core-ui wp-editor-wrap tmce-active',
 							'class': 'wp-switch-editor switch-tmce'
 						}).text( window.tinymce.translate( 'Visual' ) ) )
 						.append( $button.attr({
 							id: id + '-html',
 							'class': 'wp-switch-editor switch-html'
-						}).text( window.tinymce.translate( 'Text' ) ) )
+						}).text( window.tinymce.translate( 'Code|tab' ) ) )
 					).append( $editorContainer )
 			);
 			$textarea.after( $wrap );
 			$editorContainer.append( $textarea );

enmi-conf.org