| Index: trunk/extensions/InlineEditor/TemplateEditor/TemplateEditor.class.php |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | foreach ( $matches[0] as $match ) { |
| 20 | 20 | $start = $match[1]; |
| 21 | 21 | $end = $start + strlen( $match[0] ); |
| 22 | | - $inlineEditorText->addMarking( new InlineEditorMarking( $start, $end, 'templateEditorElement inlineEditorBasic', true, false ) ); |
| | 22 | + $inlineEditorText->addMarking( new InlineEditorMarking( $start, $end, 'templateEditorElement inlineEditorBasic', true, false, 0, false ) ); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | return true; |
| Index: trunk/extensions/InlineEditor/InlineEditorText.class.php |
| — | — | @@ -260,7 +260,7 @@ |
| 261 | 261 | protected function collapseMarkings() { |
| 262 | 262 | foreach( $this->markings as $id => $marking ) { |
| 263 | 263 | if( isset( $previous ) ) { |
| 264 | | - if( $previous->getCollapsible() && $marking->samePositionAs( $previous ) ) { |
| | 264 | + if( $marking->getCollapsible() && $marking->samePositionAs( $previous ) ) { |
| 265 | 265 | unset( $this->markings[$previousID] ); |
| 266 | 266 | } |
| 267 | 267 | } |
| Index: trunk/extensions/InlineEditor/MediaEditor/MediaEditor.class.php |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | if ( $namespace == NS_FILE ) { |
| 33 | 33 | $start = $match[1]; |
| 34 | 34 | $end = $start + strlen( $match[0] ); |
| 35 | | - $inlineEditorText->addMarking( new InlineEditorMarking( $start, $end, 'mediaEditorElement inlineEditorBasic', true, false ) ); |
| | 35 | + $inlineEditorText->addMarking( new InlineEditorMarking( $start, $end, 'mediaEditorElement inlineEditorBasic', true, false, 0, false ) ); |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | |
| Index: trunk/extensions/InlineEditor/InlineEditorMarking.class.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | protected $block; /// < whether the tag should be added as a block or inline |
| 17 | 17 | protected $bar; /// < whether the text should carry a bar at the left, or be fully selectable |
| 18 | 18 | protected $level; /// < nesting level, which is used to sort consistently when two markings are of same length |
| 19 | | - protected $collapsible; /// < whether or not the marking can be collapsed when only containing one nested element |
| | 19 | + protected $collapsible; /// < whether or not the marking can be collapsed by removing parent elements of the same size |
| 20 | 20 | |
| 21 | 21 | protected $id; /// < id in the original text; this will be unique even when calculating new ids! |
| 22 | 22 | protected $matched; /// < bool whether or not this marking has been matched with a previous marking (default: true) |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | * @param $block bool Whether the tag should be added as a block or inline |
| 29 | 29 | * @param $bar bool Whether the text should carry a bar at the left, or be fully selectable |
| 30 | 30 | * @param $level int Nesting level, which is used to sort consistently when two markings are of same length, default: 0 |
| 31 | | - * @param $collapsible bool Whether or not the marking can be collapsed when only containing one nested element, default: true |
| | 31 | + * @param $collapsible bool Whether or not the marking can be collapsed by removing parent elements of the same size |
| 32 | 32 | */ |
| 33 | 33 | function __construct( $start, $end, $classes, $block, $bar, $level = 0, $collapsible = true ) { |
| 34 | 34 | $this->start = $start; |
| — | — | @@ -187,7 +187,7 @@ |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | /** |
| 191 | | - * Get whether or not the marking can be collapsed when only containing one nested element. |
| | 191 | + * Get whether or not the marking can be collapsed by removing parent elements of the same size |
| 192 | 192 | * @param $value int |
| 193 | 193 | */ |
| 194 | 194 | public function getCollapsible() { |