XWiki Platform

Automatically add empty new line before/after macros when inserting standalone macros

Details

  • Type: Improvement Improvement
  • Status: Closed Closed
  • Priority: Major Major
  • Resolution: Fixed
  • Affects Version/s: 1.9
  • Fix Version/s: 4.0-milestone-1, 3.5.1
  • Component/s: WYSIWYG Editor
  • Labels:
    None
  • Tests:
    Integration
  • Development Priority:
    High
  • Difficulty:
    Medium
  • Similar issues:
    XWIKI-4884Hide the first and last new line when editing a standalone macro
    XWIKI-3551Cannot insert standalone macros
    XWIKI-5050A macro followed by a single new line is standalone
    XWIKI-3562Standalone macros should take 100% of the available space in the GWT WYSIWYG
    XWIKI-5013HTML code visible when inserting velocity macro displaying a property
    XWIKI-3297Add ability to insert macros
    XWIKI-3233Add ability to edit inserted macros
    XWIKI-259Add a macro button in the WYSIWYG allowing to insert from a configurable list of macros
    XWIKI-3762Macro insertion issue in IE6 -> next paragraph style is lost
    XWIKI-4856Charset errors on macro insertion

Description

Happens when using the wysiwyg to insert a ToC macro.
If i do not leave a line above the macro, user gets this message :
"not an inline macro" which is not helpful.
That warning message will be displayed once the page is saved.

Not working : 

**Content Table**
{{toc/}}

== Section A ==

Working : 

**Content Table**

{{toc/}}

== Section A ==

Issue Links

depends on

New Feature - A new feature of the product, which has yet to be developed. XWIKI-4911 Add a generic executable for inserting block-level HTML elements

  • Major - Major loss of function.
  • Closed - The issue is considered finished, the resolution is correct and has been pushed to production. Issues which are not closed can be reopened.
is duplicated by

Bug - A problem which impairs or prevents the functions of the product. XE-894 "Not an inline macro" message displayed when text right after the macro

  • Major - Major loss of function.
  • Closed - The issue is considered finished, the resolution is correct and has been pushed to production. Issues which are not closed can be reopened.

Improvement - An improvement or enhancement to an existing feature or task. XE-681 non-inline macro's are placed inline by WYSIWYG editor

  • Minor - Minor loss of function, or other problem where easy workaround is present.
  • Closed - The issue is considered finished, the resolution is correct and has been pushed to production. Issues which are not closed can be reopened.
relates to

Bug - A problem which impairs or prevents the functions of the product. XWIKI-4823 Macro block parameters are lost

  • Major - Major loss of function.
  • Open - The issue is open and ready for the assignee to start work on it.

Bug - A problem which impairs or prevents the functions of the product. XWIKI-4461 Cannot have a cursor around macro blocks in Wysiwyg

  • Major - Major loss of function.
  • Closed - The issue is considered finished, the resolution is correct and has been pushed to production. Issues which are not closed can be reopened.

Activity

Ascending order - Click to sort in descending order
Vincent Massol made changes -
Field Original Value New Value
Component/s Editor - GWT WYSIWYG [ 10670 ]
Summary ToC Macro : "not an inline macro" incomprehensible message Automatically add empty new line before/after macros when inserting standalone macros
Component/s Core [ 10116 ]
Issue Type Bug [ 1 ] Improvement [ 4 ]
Marius Dumitru Florea made changes -
Assignee Marius Dumitru Florea [ mflorea ]
Hide
Permalink
Marius Dumitru Florea added a comment -

I'll make sure the ToC macro is inserted in the right place when using the WYSIWYG. Wiki syntax users will have to take care of this themselves though so we should make the message more clear anyway.

Show
Marius Dumitru Florea added a comment - I'll make sure the ToC macro is inserted in the right place when using the WYSIWYG. Wiki syntax users will have to take care of this themselves though so we should make the message more clear anyway.
Marius Dumitru Florea made changes -
Priority Major [ 3 ] Critical [ 2 ]
Development Priority High
Difficulty Unknown Medium
Marius Dumitru Florea made changes -
Link This issue depends on XWIKI-4911 [ XWIKI-4911 ]
Marius Dumitru Florea made changes -
Link This issue relates to XWIKI-4823 [ XWIKI-4823 ]
Marius Dumitru Florea made changes -
Link This issue is duplicated by XE-681 [ XE-681 ]
Vincent Massol made changes -
Priority Critical [ 2 ] Major [ 3 ]
Hide
Permalink
Thibaut Camberlin added a comment -

Can we also deal with wiki mode?

Show
Thibaut Camberlin added a comment - Can we also deal with wiki mode?
Sergiu Dumitriu made changes -
Link This issue is duplicated by XE-894 [ XE-894 ]
Hide
Permalink
Sergiu Dumitriu added a comment -

Can we also deal with wiki mode?

What do you mean? There's no button for adding a table of contents.

Some of the buttons from the wiki editor toolbar do leave a blank line where needed and safe. For example headings, the HTML and the Velocity macros do leave an empty line around them.

Show
Sergiu Dumitriu added a comment - Can we also deal with wiki mode? What do you mean? There's no button for adding a table of contents. Some of the buttons from the wiki editor toolbar do leave a blank line where needed and safe. For example headings, the HTML and the Velocity macros do leave an empty line around them.
Marius Dumitru Florea made changes -
Link This issue relates to XWIKI-4461 [ XWIKI-4461 ]
Marius Dumitru Florea
01/Mar/12 11:24
View full commit
XWIKI-4048: Automatically add empty new line before/after macros when inserting standalone macros * Split the current block when inserting a stand-alone macro. (cherry picked from commit 5b3a6afbaf69ac622f3eb0290506cfad8da4fa63)
feature-portlet-3.5.x
+1
-1
xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-client/src/main/java/org/xwiki/gwt/wysiwyg/client/plugin/macro/MacroPlugin.java
+57
-4
xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-client/src/main/java/org/xwiki/gwt/wysiwyg/client/plugin/macro/exec/InsertExecutable.java
Marius Dumitru Florea
01/Mar/12 11:24
View full commit
XWIKI-4048: Automatically add empty new line before/after macros when inserting standalone macros * Split the current block when inserting a stand-alone macro.
master
+1
-1
xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-client/src/main/java/org/xwiki/gwt/wysiwyg/client/plugin/macro/MacroPlugin.java
+57
-4
xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-client/src/main/java/org/xwiki/gwt/wysiwyg/client/plugin/macro/exec/InsertExecutable.java
Marius Dumitru Florea
01/Mar/12 11:51
View full commit
XWIKI-4048: Automatically add empty new line before/after macros when inserting standalone macros * Add clirr excludes. I believe the second exclude is required because of a clirr bug. (cherry picked from commit a6513ed8f906f56d6606847e9a1d523e3aa8fcf0)
feature-portlet-3.5.x
+2
-
xwiki-platform-core/pom.xml
Marius Dumitru Florea
01/Mar/12 11:51
View full commit
XWIKI-4048: Automatically add empty new line before/after macros when inserting standalone macros * Add clirr excludes. I believe the second exclude is required because of a clirr bug.
master
+2
-
xwiki-platform-core/pom.xml
Marius Dumitru Florea
02/Mar/12 15:56
View full commit
XWIKI-4048: Automatically add empty new line before/after macros when inserting standalone macros * Add functional test.
feature-portlet-3.5.x
+24
-
xwiki-enterprise-test/xwiki-enterprise-test-wysiwyg/src/test/it/org/xwiki/test/wysiwyg/MacroTest.java
Marius Dumitru Florea
02/Mar/12 15:56
View full commit
XWIKI-4048: Automatically add empty new line before/after macros when inserting standalone macros * Add functional test.
master
+24
-
xwiki-enterprise-test/xwiki-enterprise-test-wysiwyg/src/test/it/org/xwiki/test/wysiwyg/MacroTest.java
Hide
Permalink
Marius Dumitru Florea added a comment -

I've fixed the problem by splitting the insertion point when a stand-alone macro is inserted in-line. Note that this behavior is similar to what happens when a table is inserted in-line.

Show
Marius Dumitru Florea added a comment - I've fixed the problem by splitting the insertion point when a stand-alone macro is inserted in-line. Note that this behavior is similar to what happens when a table is inserted in-line.
Marius Dumitru Florea made changes -
Status Open [ 1 ] Closed [ 6 ]
Tests Integration [ 10003 ]
Fix Version/s 3.5.1 [ 12968 ]
Fix Version/s 4.0-milestone-1 [ 12956 ]
Resolution Fixed [ 1 ]

People

  • Assignee:
    Marius Dumitru Florea
    Reporter:
    Stéphane Barbey
Vote (2)
Watch (3)

Dates

  • Created:
    Updated:
    Resolved:
    Date of First Response: