Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
cc2fec2e
Commit
cc2fec2e
authored
Mar 19, 2014
by
cahrens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow TinyMCE to create p's, else formatting doesn't work.
parent
b1f4d28e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
4 deletions
+1
-4
cms/djangoapps/contentstore/features/html-editor.feature
+1
-0
common/lib/xmodule/xmodule/js/src/html/edit.coffee
+0
-4
No files found.
cms/djangoapps/contentstore/features/html-editor.feature
View file @
cc2fec2e
...
@@ -33,6 +33,7 @@ Feature: CMS.HTML Editor
...
@@ -33,6 +33,7 @@ Feature: CMS.HTML Editor
And
I save the page
And
I save the page
Then the page has text
:
Then the page has text
:
"""
"""
<p> </p>
<p class="title">pages</p>
<p class="title">pages</p>
<style><!--
<style><!--
.title { color: red; }
.title { color: red; }
...
...
common/lib/xmodule/xmodule/js/src/html/edit.coffee
View file @
cc2fec2e
...
@@ -48,10 +48,6 @@ class @HTMLEditingDescriptor
...
@@ -48,10 +48,6 @@ class @HTMLEditingDescriptor
statusbar
:
false
,
statusbar
:
false
,
# Necessary to avoid stripping of style tags.
# Necessary to avoid stripping of style tags.
valid_children
:
"+body[style]"
,
valid_children
:
"+body[style]"
,
# Prevent TinyMCE from adding extra <p> </p> in code.
forced_root_block
:
""
,
force_br_newlines
:
true
,
force_p_newlines
:
false
,
setup
:
@
setupTinyMCE
,
setup
:
@
setupTinyMCE
,
# Cannot get access to tinyMCE Editor instance (for focusing) until after it is rendered.
# Cannot get access to tinyMCE Editor instance (for focusing) until after it is rendered.
# The tinyMCE callback passes in the editor as a paramter.
# The tinyMCE callback passes in the editor as a paramter.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment