Skip to content

Commit

Permalink
fix: Applied "getFormElement" to indent and node function
Browse files Browse the repository at this point in the history
  • Loading branch information
JiHong88 committed Sep 20, 2018
1 parent f2609c1 commit e1c30b2
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 15 deletions.
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ suneditor.create('sample', {
['font', 'fontSize', 'formatBlock'],
['bold', 'underline', 'italic', 'strike', 'subscript', 'superscript'],
['removeFormat'],
'/', Line break
'/', // Line break
['fontColor', 'hiliteColor'],
['indent', 'outdent'],
['align', 'horizontalRule', 'list', 'table'],
Expand Down Expand Up @@ -233,7 +233,6 @@ initEditor.create('sample_2', {

### options
```javascript
// Plugins
plugins: [
font,
fontSize,
Expand All @@ -247,8 +246,7 @@ plugins: [
link,
image,
video
],
// User Options
] : Plugins array default : null
fontSize : Change default font-size List default : null
font : Change default font-family List default : null
width : The width size of the editor default : textarea.offsetHeight
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "suneditor",
"version": "2.0.12",
"version": "2.0.13",
"description": "Pure JavaScript based WYSIWYG web editor",
"main": "src/suneditor.js",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion dist/suneditor.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"sideEffects": [
"./src/assets/css/*.css"
],
"version": "2.0.12",
"version": "2.0.13",
"description": "Pure JavaScript based WYSIWYG web editor",
"main": "src/suneditor.js",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion sample/build/suneditor.customize.js

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions sample/html/getting-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ <h4>3. Load all plugins</h4>
[<span class="pl-s"><span class="pl-pds">'</span>font<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>fontSize<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>formatBlock<span class="pl-pds">'</span></span>],
[<span class="pl-s"><span class="pl-pds">'</span>bold<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>underline<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>italic<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>strike<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>subscript<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>superscript<span class="pl-pds">'</span></span>],
[<span class="pl-s"><span class="pl-pds">'</span>removeFormat<span class="pl-pds">'</span></span>],
<span class="pl-s"><span class="pl-pds">'</span>/<span class="pl-pds">'</span></span>, Line <span class="pl-k">break</span>
<span class="pl-s"><span class="pl-pds">'</span>/<span class="pl-pds">'</span></span>, <span class="pl-c"><span class="pl-c">//</span> Line break</span>
[<span class="pl-s"><span class="pl-pds">'</span>fontColor<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>hiliteColor<span class="pl-pds">'</span></span>],
[<span class="pl-s"><span class="pl-pds">'</span>indent<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>outdent<span class="pl-pds">'</span></span>],
[<span class="pl-s"><span class="pl-pds">'</span>align<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>horizontalRule<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>list<span class="pl-pds">'</span></span>, <span class="pl-s"><span class="pl-pds">'</span>table<span class="pl-pds">'</span></span>],
Expand Down Expand Up @@ -242,8 +242,7 @@ <h4>options</h4>
link,
image,
video
],
<span class="pl-c"><span class="pl-c">//</span> User Options</span>
] <span class="pl-k">:</span> Plugins array<span class="pl-k"></span> default <span class="pl-k">:</span> <span class="pl-c1">null</span>
fontSize <span class="pl-k">:</span> Change default font<span class="pl-k">-</span>size List default <span class="pl-k">:</span> <span class="pl-c1">null</span>
font <span class="pl-k">:</span> Change default font<span class="pl-k">-</span>family List default <span class="pl-k">:</span> <span class="pl-c1">null</span>
width <span class="pl-k">:</span> The width size <span class="pl-k">of</span> the editor default <span class="pl-k">:</span> <span class="pl-smi">textarea</span>.<span class="pl-smi">offsetHeight</span>
Expand Down
6 changes: 3 additions & 3 deletions src/lib/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -588,8 +588,8 @@ const core = function (context, util, plugins, lang) {
return util.isFormatElement(current);
});

let startLine = util.getParentElement(startCon, 'P');
let endLine = util.getParentElement(endCon, 'P');
let startLine = util.getFormatElement(startCon);
let endLine = util.getFormatElement(endCon);

for (let i = 0, len = lineNodes.length; i < len; i++) {
if (startLine === lineNodes[i]) {
Expand Down Expand Up @@ -947,7 +947,7 @@ const core = function (context, util, plugins, lang) {
* @param command {String} - Separator ("indent" or "outdent")
*/
indent: function (element, command) {
const p = util.getParentElement(element, 'P');
const p = util.getFormatElement(element);
if (!p) return;

let margin = /\d+/.test(p.style.marginLeft) ? p.style.marginLeft.match(/\d+/)[0] * 1 : 0;
Expand Down

0 comments on commit e1c30b2

Please sign in to comment.