L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-45227 editor_atto: Add direction to default ATTO generated markup

Browse Source
This commit is contained in:
Nadav Kavalerchik
2020-03-27 21:25:41 +11:00
committed by Shamim Rezaie
parent d939d6e769
commit b10155308f
7 changed files with 100 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
Vendored
+32 -5
View File
@@ -150,6 +150,14 @@ Y.extend(Editor, Y.Base, {
*/
plugins: null,
/**
* An indicator of the current input direction.
*
* @property coreDirection
* @type string
*/
coreDirection: null,
/**
* Event Handles to clear on editor destruction.
*
@@ -196,6 +204,9 @@ Y.extend(Editor, Y.Base, {
this.editor.setAttribute('aria-labelledby', this.textareaLabel.get("id"));
}
// Set diretcion according to current page language.
this.coreDirection = Y.one('body').hasClass('dir-rtl') ? 'rtl' : 'ltr';
// Add everything to the wrapper.
this.setupToolbar();
@@ -681,10 +692,16 @@ EditorTextArea.prototype = {
* @private
*/
_getEmptyContent: function() {
if (Y.UA.ie && Y.UA.ie < 10) {
return '<p></p>';
var alignment;
if (this.coreDirection === 'rtl') {
alignment = 'style="text-align: right;"';
} else {
return '<p><br></p>';
alignment = 'style="text-align: left;"';
}
if (Y.UA.ie && Y.UA.ie < 10) {
return '<p dir="' + this.coreDirection + '" ' + alignment + '></p>';
} else {
return '<p dir="' + this.coreDirection + '" ' + alignment + '><br></p>';
}
},
@@ -1324,7 +1341,11 @@ EditorClean.prototype = {
html = editorClone.get('innerHTML');
// Revert untouched editor contents to an empty string.
if (html === '<p></p>' || html === '<p><br></p>') {
if ((html === '<p></p>' || html === '<p><br></p>') ||
(html === '<p dir="rtl" style="text-align: right;"></p>' ||
html === '<p dir="rtl" style="text-align: right;"><br></p>') ||
(html === '<p dir="ltr" style="text-align: left;"></p>' ||
html === '<p dir="ltr" style="text-align: left;"><br></p>')) {
return '';
}
@@ -2729,8 +2750,14 @@ EditorStyling.prototype = {
// No valid block element - make one.
if (!nearestblock) {
var alignment;
if (this.coreDirection === 'rtl') {
alignment = 'style="text-align: right;"';
} else {
alignment = 'style="text-align: left;"';
}
// There is no block node in the content, wrap the content in a p and use that.
newcontent = Y.Node.create('<p></p>');
newcontent = Y.Node.create('<p dir="' + this.coreDirection + '" ' + alignment + '></p>');
boundary.get('childNodes').each(function(child) {
newcontent.append(child.remove());
});
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Vendored
+4 -4
View File
File diff suppressed because one or more lines are too long
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
Vendored
+32 -5
View File
@@ -150,6 +150,14 @@ Y.extend(Editor, Y.Base, {
*/
plugins: null,
/**
* An indicator of the current input direction.
*
* @property coreDirection
* @type string
*/
coreDirection: null,
/**
* Event Handles to clear on editor destruction.
*
@@ -194,6 +202,9 @@ Y.extend(Editor, Y.Base, {
this.editor.setAttribute('aria-labelledby', this.textareaLabel.get("id"));
}
// Set diretcion according to current page language.
this.coreDirection = Y.one('body').hasClass('dir-rtl') ? 'rtl' : 'ltr';
// Add everything to the wrapper.
this.setupToolbar();
@@ -676,10 +687,16 @@ EditorTextArea.prototype = {
* @private
*/
_getEmptyContent: function() {
if (Y.UA.ie && Y.UA.ie < 10) {
return '<p></p>';
var alignment;
if (this.coreDirection === 'rtl') {
alignment = 'style="text-align: right;"';
} else {
return '<p><br></p>';
alignment = 'style="text-align: left;"';
}
if (Y.UA.ie && Y.UA.ie < 10) {
return '<p dir="' + this.coreDirection + '" ' + alignment + '></p>';
} else {
return '<p dir="' + this.coreDirection + '" ' + alignment + '><br></p>';
}
},
@@ -1313,7 +1330,11 @@ EditorClean.prototype = {
html = editorClone.get('innerHTML');
// Revert untouched editor contents to an empty string.
if (html === '<p></p>' || html === '<p><br></p>') {
if ((html === '<p></p>' || html === '<p><br></p>') ||
(html === '<p dir="rtl" style="text-align: right;"></p>' ||
html === '<p dir="rtl" style="text-align: right;"><br></p>') ||
(html === '<p dir="ltr" style="text-align: left;"></p>' ||
html === '<p dir="ltr" style="text-align: left;"><br></p>')) {
return '';
}
@@ -2715,8 +2736,14 @@ EditorStyling.prototype = {
// No valid block element - make one.
if (!nearestblock) {
var alignment;
if (this.coreDirection === 'rtl') {
alignment = 'style="text-align: right;"';
} else {
alignment = 'style="text-align: left;"';
}
// There is no block node in the content, wrap the content in a p and use that.
newcontent = Y.Node.create('<p></p>');
newcontent = Y.Node.create('<p dir="' + this.coreDirection + '" ' + alignment + '></p>');
boundary.get('childNodes').each(function(child) {
newcontent.append(child.remove());
});
lib/editor/atto/yui/src/editor/js/clean.js
Vendored
+5 -1
View File
@@ -55,7 +55,11 @@ EditorClean.prototype = {
html = editorClone.get('innerHTML');
// Revert untouched editor contents to an empty string.
if (html === '<p></p>' || html === '<p><br></p>') {
if ((html === '<p></p>' || html === '<p><br></p>') ||
(html === '<p dir="rtl" style="text-align: right;"></p>' ||
html === '<p dir="rtl" style="text-align: right;"><br></p>') ||
(html === '<p dir="ltr" style="text-align: left;"></p>' ||
html === '<p dir="ltr" style="text-align: left;"><br></p>')) {
return '';
}
lib/editor/atto/yui/src/editor/js/editor.js
Vendored
+11
View File
@@ -148,6 +148,14 @@ Y.extend(Editor, Y.Base, {
*/
plugins: null,
/**
* An indicator of the current input direction.
*
* @property coreDirection
* @type string
*/
coreDirection: null,
/**
* Event Handles to clear on editor destruction.
*
@@ -194,6 +202,9 @@ Y.extend(Editor, Y.Base, {
this.editor.setAttribute('aria-labelledby', this.textareaLabel.get("id"));
}
// Set diretcion according to current page language.
this.coreDirection = Y.one('body').hasClass('dir-rtl') ? 'rtl' : 'ltr';
// Add everything to the wrapper.
this.setupToolbar();
lib/editor/atto/yui/src/editor/js/styling.js
Vendored
+7 -1
View File
@@ -175,8 +175,14 @@ EditorStyling.prototype = {
// No valid block element - make one.
if (!nearestblock) {
var alignment;
if (this.coreDirection === 'rtl') {
alignment = 'style="text-align: right;"';
} else {
alignment = 'style="text-align: left;"';
}
// There is no block node in the content, wrap the content in a p and use that.
newcontent = Y.Node.create('<p></p>');
newcontent = Y.Node.create('<p dir="' + this.coreDirection + '" ' + alignment + '></p>');
boundary.get('childNodes').each(function(child) {
newcontent.append(child.remove());
});
lib/editor/atto/yui/src/editor/js/textarea.js
Vendored
+9 -3
View File
@@ -45,10 +45,16 @@ EditorTextArea.prototype = {
* @private
*/
_getEmptyContent: function() {
if (Y.UA.ie && Y.UA.ie < 10) {
return '<p></p>';
var alignment;
if (this.coreDirection === 'rtl') {
alignment = 'style="text-align: right;"';
} else {
return '<p><br></p>';
alignment = 'style="text-align: left;"';
}
if (Y.UA.ie && Y.UA.ie < 10) {
return '<p dir="' + this.coreDirection + '" ' + alignment + '></p>';
} else {
return '<p dir="' + this.coreDirection + '" ' + alignment + '><br></p>';
}
},