https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103359
Revision: 103359
Author: catrope
Date: 2011-11-16 19:28:13 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Drop droppable (oh, how meta!) attribute introduced in r103211. Will convert
prepareRemoval() later
Modified Paths:
--------------
trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js
trunk/extensions/VisualEditor/modules/es/models/es.HeadingModel.js
trunk/extensions/VisualEditor/modules/es/models/es.ListItemModel.js
trunk/extensions/VisualEditor/modules/es/models/es.ListModel.js
trunk/extensions/VisualEditor/modules/es/models/es.ParagraphModel.js
trunk/extensions/VisualEditor/modules/es/models/es.PreModel.js
trunk/extensions/VisualEditor/modules/es/models/es.TableCellModel.js
trunk/extensions/VisualEditor/modules/es/models/es.TableModel.js
trunk/extensions/VisualEditor/modules/es/models/es.TableRowModel.js
Modified: trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js
2011-11-16 19:26:16 UTC (rev 103358)
+++ trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js
2011-11-16 19:28:13 UTC (rev 103359)
@@ -40,32 +40,26 @@
* parents and children properties may contain one of two possible values:
* {Array} List symbolic names of allowed element types (if empty,
none will be allowed)
* {Null} Any element type is allowed (as long as the other element
also allows it)
- * droppable:
- * {Boolean} Whether the node can be dropped from it's parent (false
for table cells)
*
* @example Paragraph rules
* {
* 'parents': null,
- * 'children': [],
- * 'droppable': true
+ * 'children': []
* }
* @example List rules
* {
* 'parents': null,
- * 'children': ['listItem'],
- * 'droppable': true
+ * 'children': ['listItem']
* }
* @example ListItem rules
* {
* 'parents': ['list'],
- * 'children': null,
- * 'droppable': true
+ * 'children': null
* }
* @example TableCell rules
* {
* 'parents': ['tableRow'],
- * 'children': null,
- * 'droppable': false
+ * 'children': null
* }
*/
es.DocumentModel.nodeRules = {};
@@ -848,7 +842,7 @@
// Handle selected nodes
if ( !selectedNode.range ) {
// Drop whole nodes
- if (
rules[selectedNode.node.getElementType()].droppable ) {
+ if (
/*rules[selectedNode.node.getElementType()].droppable*/ true ) {
tx.pushRemove(
doc.data.slice( left, right ) );
} else {
tx.pushRetain( 1 );
Modified: trunk/extensions/VisualEditor/modules/es/models/es.HeadingModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.HeadingModel.js
2011-11-16 19:26:16 UTC (rev 103358)
+++ trunk/extensions/VisualEditor/modules/es/models/es.HeadingModel.js
2011-11-16 19:28:13 UTC (rev 103359)
@@ -30,8 +30,7 @@
es.DocumentModel.nodeRules.heading = {
'parents': null,
- 'children': [],
- 'droppable': true
+ 'children': []
};
/* Inheritance */
Modified: trunk/extensions/VisualEditor/modules/es/models/es.ListItemModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.ListItemModel.js
2011-11-16 19:26:16 UTC (rev 103358)
+++ trunk/extensions/VisualEditor/modules/es/models/es.ListItemModel.js
2011-11-16 19:28:13 UTC (rev 103359)
@@ -30,8 +30,7 @@
es.DocumentModel.nodeRules.listItem = {
'parents': ['list'],
- 'children': null,
- 'droppable': true
+ 'children': null
};
/* Inheritance */
Modified: trunk/extensions/VisualEditor/modules/es/models/es.ListModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.ListModel.js
2011-11-16 19:26:16 UTC (rev 103358)
+++ trunk/extensions/VisualEditor/modules/es/models/es.ListModel.js
2011-11-16 19:28:13 UTC (rev 103359)
@@ -30,8 +30,7 @@
es.DocumentModel.nodeRules.list = {
'parents': null,
- 'children': ['listItem'],
- 'droppable': true
+ 'children': ['listItem']
};
/* Inheritance */
Modified: trunk/extensions/VisualEditor/modules/es/models/es.ParagraphModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.ParagraphModel.js
2011-11-16 19:26:16 UTC (rev 103358)
+++ trunk/extensions/VisualEditor/modules/es/models/es.ParagraphModel.js
2011-11-16 19:28:13 UTC (rev 103359)
@@ -30,8 +30,7 @@
es.DocumentModel.nodeRules.paragraph = {
'parents': null,
- 'children': [],
- 'droppable': true
+ 'children': []
};
/* Inheritance */
Modified: trunk/extensions/VisualEditor/modules/es/models/es.PreModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.PreModel.js
2011-11-16 19:26:16 UTC (rev 103358)
+++ trunk/extensions/VisualEditor/modules/es/models/es.PreModel.js
2011-11-16 19:28:13 UTC (rev 103359)
@@ -30,8 +30,7 @@
es.DocumentModel.nodeRules.pre = {
'parents': null,
- 'children': [],
- 'droppable': true
+ 'children': []
};
/* Inheritance */
Modified: trunk/extensions/VisualEditor/modules/es/models/es.TableCellModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.TableCellModel.js
2011-11-16 19:26:16 UTC (rev 103358)
+++ trunk/extensions/VisualEditor/modules/es/models/es.TableCellModel.js
2011-11-16 19:28:13 UTC (rev 103359)
@@ -30,8 +30,7 @@
es.DocumentModel.nodeRules.tableCell = {
'parents': ['tableRow'],
- 'children': null,
- 'droppable': false
+ 'children': null
};
/* Inheritance */
Modified: trunk/extensions/VisualEditor/modules/es/models/es.TableModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.TableModel.js
2011-11-16 19:26:16 UTC (rev 103358)
+++ trunk/extensions/VisualEditor/modules/es/models/es.TableModel.js
2011-11-16 19:28:13 UTC (rev 103359)
@@ -30,8 +30,7 @@
es.DocumentModel.nodeRules.table = {
'parents': null,
- 'children': ['tableRow'],
- 'droppable': true
+ 'children': ['tableRow']
};
/* Inheritance */
Modified: trunk/extensions/VisualEditor/modules/es/models/es.TableRowModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.TableRowModel.js
2011-11-16 19:26:16 UTC (rev 103358)
+++ trunk/extensions/VisualEditor/modules/es/models/es.TableRowModel.js
2011-11-16 19:28:13 UTC (rev 103359)
@@ -30,8 +30,7 @@
es.DocumentModel.nodeRules.tableRow = {
'parents': ['table'],
- 'children': ['tableCell'],
- 'droppable': true
+ 'children': ['tableCell']
};
/* Inheritance */
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
