diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b860fdc4c0..e2c0982bf3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,7 @@ Changelog * Fix: Image rendition / document file deletion now happens on a post_delete signal, so that files are not lost if the deletion does not proceed (Janneke Janssen) * Fix: "Your recent edits" list on dashboard no longer leaves out pages that another user has subsequently edited (Michael Cordover, Kees Hink, João Luiz Lorencetti) * Fix: `InlinePanel` now accepts a `classname` parameter as per the documentation (emg36, Matt Westcott) + * Fix: Disabled use of escape key to revert content of rich text fields, which could cause accidental data loss (Matt Westcott) 1.6.2 (02.09.2016) diff --git a/docs/releases/1.7.rst b/docs/releases/1.7.rst index be9b8a3414..9756063cd5 100644 --- a/docs/releases/1.7.rst +++ b/docs/releases/1.7.rst @@ -54,6 +54,7 @@ Bug fixes * Image rendition / document file deletion now happens on a post_delete signal, so that files are not lost if the deletion does not proceed (Janneke Janssen) * "Your recent edits" list on dashboard no longer leaves out pages that another user has subsequently edited (Michael Cordover, Kees Hink, João Luiz Lorencetti) * ``InlinePanel`` now accepts a ``classname`` parameter as per the documentation (emg36, Matt Westcott) + * Disabled use of escape key to revert content of rich text fields, which could cause accidental data loss (Matt Westcott) Upgrade considerations diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/hallo.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/hallo.js index 9e4655dc45..716fe67041 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/hallo.js +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/hallo.js @@ -307,18 +307,8 @@ } }, _keys: function(event) { - var old, widget; + var widget; widget = event.data; - if (event.keyCode === 27) { - old = widget.getContents(); - widget.restoreOriginalContent(event); - widget._trigger("restored", null, { - editable: widget, - content: widget.getContents(), - thrown: old - }); - return widget.turnOff(); - } }, _rangesEqual: function(r1, r2) { if (r1.startContainer !== r2.startContainer) {