moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle"

Browse source 
This reverts commit 61a0465ce7, reversing
changes made to 2408f8fe2b.
This commit is contained in:
Dan Poltawski 2016-04-13 10:48:59 +01:00
parent 27cec47220
commit e92a39cf0c
5 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js vendored
View file

@ -212,6 +212,11 @@ Y.extend(Editor, Y.Base, {
// Disable odd inline CSS styles. // Disable odd inline CSS styles.
this.disableCssStyling(); this.disableCssStyling();
// Use paragraphs not divs.
if (document.queryCommandSupported('DefaultParagraphSeparator')) {
document.execCommand('DefaultParagraphSeparator', false, 'p');
}
// Add the toolbar and editable zone to the page. // Add the toolbar and editable zone to the page.
this.textarea.get('parentNode').insert(this._wrapper, this.textarea). this.textarea.get('parentNode').insert(this._wrapper, this.textarea).
setAttribute('class', 'editor_atto_wrap'); setAttribute('class', 'editor_atto_wrap');
@ -293,10 +298,6 @@ Y.extend(Editor, Y.Base, {
* @chainable * @chainable
*/ */
setupAutomaticPolling: function() { setupAutomaticPolling: function() {
// Force use of <p> tags when pressing enter key
this._registerEventHandle(this.editor.on('key', function() {
document.execCommand('formatBlock', false, 'p');
}, 'press:enter', this));
this._registerEventHandle(this.editor.on(['keyup', 'cut'], this.updateOriginal, this)); this._registerEventHandle(this.editor.on(['keyup', 'cut'], this.updateOriginal, this));
this._registerEventHandle(this.editor.on('paste', this.pasteCleanup, this)); this._registerEventHandle(this.editor.on('paste', this.pasteCleanup, this));
@ -2597,7 +2598,6 @@ Y.Base.mix(Y.M.editor_atto.Editor, [EditorFilepicker]);
"overlay", "overlay",
"escape", "escape",
"event", "event",
"event-key",
"event-simulate", "event-simulate",
"event-custom", "event-custom",
"node-event-html5", "node-event-html5",

8
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js vendored
View file

File diff suppressed because one or more lines are too long

10
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js vendored
View file

@ -210,6 +210,11 @@ Y.extend(Editor, Y.Base, {
// Disable odd inline CSS styles. // Disable odd inline CSS styles.
this.disableCssStyling(); this.disableCssStyling();
// Use paragraphs not divs.
if (document.queryCommandSupported('DefaultParagraphSeparator')) {
document.execCommand('DefaultParagraphSeparator', false, 'p');
}
// Add the toolbar and editable zone to the page. // Add the toolbar and editable zone to the page.
this.textarea.get('parentNode').insert(this._wrapper, this.textarea). this.textarea.get('parentNode').insert(this._wrapper, this.textarea).
setAttribute('class', 'editor_atto_wrap'); setAttribute('class', 'editor_atto_wrap');
@ -291,10 +296,6 @@ Y.extend(Editor, Y.Base, {
* @chainable * @chainable
*/ */
setupAutomaticPolling: function() { setupAutomaticPolling: function() {
// Force use of <p> tags when pressing enter key
this._registerEventHandle(this.editor.on('key', function() {
document.execCommand('formatBlock', false, 'p');
}, 'press:enter', this));
this._registerEventHandle(this.editor.on(['keyup', 'cut'], this.updateOriginal, this)); this._registerEventHandle(this.editor.on(['keyup', 'cut'], this.updateOriginal, this));
this._registerEventHandle(this.editor.on('paste', this.pasteCleanup, this)); this._registerEventHandle(this.editor.on('paste', this.pasteCleanup, this));
@ -2584,7 +2585,6 @@ Y.Base.mix(Y.M.editor_atto.Editor, [EditorFilepicker]);
"overlay", "overlay",
"escape", "escape",
"event", "event",
"event-key",
"event-simulate", "event-simulate",
"event-custom", "event-custom",
"node-event-html5", "node-event-html5",

9
lib/editor/atto/yui/src/editor/js/editor.js vendored
View file

@ -210,6 +210,11 @@ Y.extend(Editor, Y.Base, {
// Disable odd inline CSS styles. // Disable odd inline CSS styles.
this.disableCssStyling(); this.disableCssStyling();
// Use paragraphs not divs.
if (document.queryCommandSupported('DefaultParagraphSeparator')) {
document.execCommand('DefaultParagraphSeparator', false, 'p');
}
// Add the toolbar and editable zone to the page. // Add the toolbar and editable zone to the page.
this.textarea.get('parentNode').insert(this._wrapper, this.textarea). this.textarea.get('parentNode').insert(this._wrapper, this.textarea).
setAttribute('class', 'editor_atto_wrap'); setAttribute('class', 'editor_atto_wrap');
@ -291,10 +296,6 @@ Y.extend(Editor, Y.Base, {
* @chainable * @chainable
*/ */
setupAutomaticPolling: function() { setupAutomaticPolling: function() {
// Force use of <p> tags when pressing enter key
this._registerEventHandle(this.editor.on('key', function() {
document.execCommand('formatBlock', false, 'p');
}, 'press:enter', this));
this._registerEventHandle(this.editor.on(['keyup', 'cut'], this.updateOriginal, this)); this._registerEventHandle(this.editor.on(['keyup', 'cut'], this.updateOriginal, this));
this._registerEventHandle(this.editor.on('paste', this.pasteCleanup, this)); this._registerEventHandle(this.editor.on('paste', this.pasteCleanup, this));

1
lib/editor/atto/yui/src/editor/meta/editor.json
View file

@ -7,7 +7,6 @@
"overlay", "overlay",
"escape", "escape",
"event", "event",
"event-key",
"event-simulate", "event-simulate",
"event-custom", "event-custom",
"node-event-html5", "node-event-html5",