From 387c8026a57d8a806e67d7258ad4587ca0c77a86 Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Fri, 18 Mar 2016 10:59:15 +0800
Subject: [PATCH] MDL-50795 atto: Pasting into atto removes background colour
 style.

Copying from one atto editor to another comes with a lot of style
information. This removes the color attributes which make the page
look ugly when competing with different themes.
---
 .../moodle-editor_atto-editor-debug.js        | Bin 83607 -> 83735 bytes
 .../moodle-editor_atto-editor-min.js          | Bin 20795 -> 20837 bytes
 .../moodle-editor_atto-editor.js              | Bin 82472 -> 82600 bytes
 lib/editor/atto/yui/src/editor/js/clean.js    |   2 ++
 4 files changed, 2 insertions(+)

diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index d5ed2a6f9d9e486fa2ef3266def9e617a2ecd86b..4efa43aaf7c761c07dde0447f8c41cb1d8a7849b 100644
GIT binary patch
delta 86
zcmbQ<%R0S}bpzv)$u&#4M3NGdv(t<6OH&k*^K<fx6pBkKb0!;35}&+ksiY`OGA~6J
iENi8wWp6z>eyQyA1TjYT$=u6qC$C$?vDtTt*CGI?sv!~p

delta 27
lcmV+$0ObFdjs=&E1+W36m*5rw2a}7YJ(I4Y2(!(kN}`~?3_1V+

diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index 6d7777988fdfb0aae622233a5437774cd3f82264..b64c044835e877bf7c70e4f5f48a60da60d965ea 100644
GIT binary patch
delta 84
zcmV-a0IUDIq5<Wi0kB>xB5plyE^=jXY+++%C@*4RV{2z}Z*^{DEn{zNZ*n>=DnC1u
q9V{5LZYxUz0Sb~mB?Wd}DJ*TX<Ss`S0Sc4;M;4PoMjW$VM%@biSRCsB

delta 49
zcmaF5h;jEK#tm`Wn>)0lnI{_ssIryCYU<>2ZRXQ=7oU8`kz=xf2jAozHyK8*%^hxc
Fxd6N&5VimS

diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index d15b0a73d50e7e9636be84a553c04e92cfaa294e..3b9fe61203ae88b224cdcce51340504d0e6397fa 100644
GIT binary patch
delta 74
zcmZ3{!n&fBb%XhW$p#C#M3WMev(t<6OH&k*^K<fx6pBkKb5bW?d@MHk!9q#6Y+i~k
VSlUWY%iemj?4rcY)eF`x1OR9G9+m(A

delta 18
acmZ3{%DSS3b%XhW$+gqjH}6~UY9RnmUkNn;

diff --git a/lib/editor/atto/yui/src/editor/js/clean.js b/lib/editor/atto/yui/src/editor/js/clean.js
index 0c37c581c29..5b86018661a 100644
--- a/lib/editor/atto/yui/src/editor/js/clean.js
+++ b/lib/editor/atto/yui/src/editor/js/clean.js
@@ -290,6 +290,8 @@ EditorClean.prototype = {
             {regex: /(<[^>]*?style\s*?=\s*?")([^>"]*)(")/gi, replace: function(match, group1, group2, group3) {
                     // Remove MSO-blah, MSO:blah style attributes.
                     group2 = group2.replace(/(?:^|;)[\s]*MSO[-:](?:&[\w]*;|[^;"])*/gi,"");
+                    // Remove backgroud color style.
+                    group2 = group2.replace(/background-color:.*?;/gi,"");
                     return group1 + group2 + group3;
                 }},
             // Get all class attributes so we can work on them.
-- 
2.17.1