Merge "Revert "Add support for <blockquote> elements""

VisualEditor.i18n.php

@@ -84,7 +84,6 @@ $messages['en'] = array(
 	'visualeditor-editsummary' => 'Describe what you changed',
 	'visualeditor-feedback-link' => 'Project:VisualEditor/Feedback',
 	'visualeditor-feedback-tool' => 'Leave feedback',
-	'visualeditor-formatdropdown-format-blockquote' => 'Blockquote',
 	'visualeditor-formatdropdown-format-heading1' => 'Heading 1',
 	'visualeditor-formatdropdown-format-heading2' => 'Heading 2',
 	'visualeditor-formatdropdown-format-heading3' => 'Heading 3',
@@ -327,7 +326,6 @@ Parameters:
 	'visualeditor-editsummary' => 'Label for the edit summary box',
 	'visualeditor-feedback-link' => 'Link to a page where users can leave feedback that is automatically posted using this tool. This should be a sub-page of {{msg-mw|visualeditor-descriptionpagelink}}',
 	'visualeditor-feedback-tool' => 'Text of tool in the toolbar that lets users provide feedback',
-	'visualeditor-formatdropdown-format-blockquote' => 'Item in the formatting dropdown for blockquoted text.',
 	'visualeditor-formatdropdown-format-heading1' => 'Item in the generic formatting dropdown for a level 1 heading.
 {{Identical|Heading}}',
 	'visualeditor-formatdropdown-format-heading2' => 'Item in the generic formatting dropdown for a level 2 heading.

VisualEditor.php

@@ -332,7 +332,6 @@ $wgResourceModules += array(
 			've/dm/nodes/ve.dm.ListNode.js',
 			've/dm/nodes/ve.dm.ParagraphNode.js',
 			've/dm/nodes/ve.dm.PreformattedNode.js',
-			've/dm/nodes/ve.dm.BlockquoteNode.js',
 			've/dm/nodes/ve.dm.TableCaptionNode.js',
 			've/dm/nodes/ve.dm.TableCellNode.js',
 			've/dm/nodes/ve.dm.TableNode.js',
@@ -404,7 +403,6 @@ $wgResourceModules += array(
 			've/ce/nodes/ve.ce.ListNode.js',
 			've/ce/nodes/ve.ce.ParagraphNode.js',
 			've/ce/nodes/ve.ce.PreformattedNode.js',
-			've/ce/nodes/ve.ce.BlockquoteNode.js',
 			've/ce/nodes/ve.ce.TableCaptionNode.js',
 			've/ce/nodes/ve.ce.TableCellNode.js',
 			've/ce/nodes/ve.ce.TableNode.js',
@@ -636,7 +634,6 @@ $wgResourceModules += array(
 			'visualeditor-editsummary',
 			'visualeditor-feedback-link',
 			'visualeditor-feedback-tool',
-			'visualeditor-formatdropdown-format-blockquote',
 			'visualeditor-formatdropdown-format-mw-heading1',
 			'visualeditor-formatdropdown-format-mw-heading2',
 			'visualeditor-formatdropdown-format-mw-heading3',

modules/ve-mw/ui/tools/dropdowns/ve.ui.MWFormatDropdownTool.js

@@ -42,8 +42,8 @@ ve.ui.MWFormatDropdownTool.static.items[6].data.type = 'mwHeading';
 ve.ui.MWFormatDropdownTool.static.items[6].label = 'visualeditor-formatdropdown-format-mw-heading6';
 ve.ui.MWFormatDropdownTool.static.items[7].data.type = 'mwPreformatted';
 
-// Move the H1 (item 1 in the list) to the end (8) so as to make it less prominent and tempting to users
-ve.ui.MWFormatDropdownTool.static.items.splice( 8, 0, ve.ui.MWFormatDropdownTool.static.items.splice( 1, 1 )[0] );
+// Move the H1 (item 1 in the list) to the end (7) so as to make it less prominent and tempting to users
+ve.ui.MWFormatDropdownTool.static.items.splice( 7, 0, ve.ui.MWFormatDropdownTool.static.items.splice( 1, 1 )[0] );
 
 /* Registration */
 

modules/ve/ce/nodes/ve.ce.BlockquoteNode.js

@@ -1,34 +0,0 @@
-/*!
- * VisualEditor ContentEditable BlockquoteNode class.
- *
- * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * ContentEditable blockquote node.
- *
- * @class
- * @extends ve.ce.BranchNode
- * @constructor
- * @param {ve.dm.BlockquoteNode} model Model to observe
- * @param {Object} [config] Config options
- */
-ve.ce.BlockquoteNode = function VeCeBlockquoteNode( model, config ) {
-	// Parent constructor
-	ve.ce.BranchNode.call( this, model, config );
-};
-
-/* Inheritance */
-
-ve.inheritClass( ve.ce.BlockquoteNode, ve.ce.BranchNode );
-
-/* Static Properties */
-
-ve.ce.BlockquoteNode.static.name = 'blockquote';
-
-ve.ce.BlockquoteNode.static.tagName = 'blockquote';
-
-/* Registration */
-
-ve.ce.nodeFactory.register( ve.ce.BlockquoteNode );

modules/ve/dm/nodes/ve.dm.BlockquoteNode.js

@@ -1,42 +0,0 @@
-/*!
- * VisualEditor DataModel BlockquoteNode class.
- *
- * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * DataModel blockquote node.
- *
- * @class
- * @extends ve.dm.BranchNode
- * @constructor
- * @param {ve.dm.LeafNode[]} [children] Child nodes to attach
- * @param {Object} [element] Reference to element in linear model
- */
-ve.dm.BlockquoteNode = function VeDmBlockquoteNode( children, element ) {
-	// Parent constructor
-	ve.dm.BranchNode.call( this, children, element );
-};
-
-/* Inheritance */
-
-ve.inheritClass( ve.dm.BlockquoteNode, ve.dm.BranchNode );
-
-/* Static Properties */
-
-ve.dm.BlockquoteNode.static.name = 'blockquote';
-
-ve.dm.BlockquoteNode.static.matchTagNames = [ 'blockquote' ];
-
-ve.dm.BlockquoteNode.static.toDataElement = function () {
-	return { 'type': 'blockquote' };
-};
-
-ve.dm.BlockquoteNode.static.toDomElements = function ( dataElement, doc ) {
-	return [ doc.createElement( 'blockquote' ) ];
-};
-
-/* Registration */
-
-ve.dm.modelRegistry.register( ve.dm.BlockquoteNode );

modules/ve/ui/styles/ve.ui.Tool.css

@@ -163,10 +163,6 @@
 	font-weight: bold;
 }
 
-.ve-ui-dropdownTool-format .ve-ui-optionWidget[rel="blockquote"] .ve-ui-labeledElement-label {
-	margin-left: 2em;
-}
-
 .ve-ui-dropdownTool-format .ve-ui-optionWidget[rel="preformatted"] .ve-ui-labeledElement-label {
 	font-family: monospace, "Courier New";
 }

modules/ve/ui/tools/dropdowns/ve.ui.FormatDropdownTool.js

@@ -109,13 +109,6 @@ ve.ui.FormatDropdownTool.static.items = [
 		'data': {
 			'type' : 'preformatted'
 		}
-	},
-	{
-		'label': 'visualeditor-formatdropdown-format-blockquote',
-		'rel': 'blockquote',
-		'data': {
-			'type' : 'blockquote'
-		}
 	}
 ];