Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Merge back PR's to master #12891

Merged
merged 8 commits into from
Nov 10, 2016
Merged

Merge back PR's to master #12891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5651f1f
Merge pull request #12844 from adobe/master
swmitra Oct 26, 2016
7d796ee
Update Finnish strings for 1.8 (#12856)
valtlai Oct 27, 2016
59cb30d
Updated by ALF automation.
walfgithub Oct 27, 2016
c90da3a
Merge pull request #12858 from adobe/alf_localization_release_1.8
swmitra Oct 28, 2016
d09eb4c
when reseting text in editor, ignore line-ending differences
zaggino Nov 1, 2016
b0d0859
add test
zaggino Nov 1, 2016
3421539
fix test
zaggino Nov 1, 2016
3af64fa
Merge pull request #12865 from adobe/zaggino/undo-history-lineendings
swmitra Nov 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/editor/Editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,11 @@ define(function (require, exports, module) {
*/
Editor.prototype._resetText = function (text) {
var currentText = this._codeMirror.getValue();
if (text === currentText) {

// compare with ignoring line-endings, issue #11826
var textLF = text ? text.replace(/(\r\n|\r|\n)/g, "\n") : null;
var currentTextLF = currentText ? currentText.replace(/(\r\n|\r|\n)/g, "\n") : null;
if (textLF === currentTextLF) {
// there's nothing to reset
return;
}
Expand Down
Loading