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

Fix for #12792 - Adding extra check to handle null mrof list entries #13495

Merged
petetnt merged 1 commit into from
Jun 29, 2017
Merged

Fix for #12792 - Adding extra check to handle null mrof list entries #13495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/extensions/default/NavigationAndHistory/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ define(function (require, exports, module) {
// Try to see if we have same doc split
// Check existing list for this doc path and active pane entry
var entryIndex = _.findIndex(_mrofList, function (record) {
return (record.file === value.file && record.paneId === MainViewManager.getActivePaneId());
return (record && record.file === value.file && record.paneId === MainViewManager.getActivePaneId());
});

// If found don't process this entry, as the document is already present in active pane
Expand Down Expand Up @@ -559,7 +559,7 @@ define(function (require, exports, module) {

// Check existing list for this doc path and pane entry
var index = _.findIndex(_mrofList, function (record) {
return (record.file === filePath && record.paneId === paneId);
return (record && record.file === filePath && record.paneId === paneId);
});

var entry;
Expand Down Expand Up @@ -587,7 +587,7 @@ define(function (require, exports, module) {

// Check existing list for this doc path and pane entry
var index = _.findIndex(_mrofList, function (record) {
return (record.file === filePath && record.paneId === paneId);
return (record && record.file === filePath && record.paneId === paneId);
});

var entry;
Expand Down Expand Up @@ -621,13 +621,13 @@ define(function (require, exports, module) {
function _handleWorkingSetMove(event, file, sourcePaneId, destinationPaneId) {
// Check existing list for this doc path and source pane entry
var index = _.findIndex(_mrofList, function (record) {
return (record.file === file.fullPath && record.paneId === sourcePaneId);
return (record && record.file === file.fullPath && record.paneId === sourcePaneId);
}), tIndex;
// If an entry is found update the pane info
if (index >= 0) {
// But an entry with the target pane Id should not exist
tIndex = _.findIndex(_mrofList, function (record) {
return (record.file === file.fullPath && record.paneId === destinationPaneId);
return (record && record.file === file.fullPath && record.paneId === destinationPaneId);
});
if (tIndex === -1) {
_mrofList[index].paneId = destinationPaneId;
Expand Down Expand Up @@ -706,7 +706,7 @@ define(function (require, exports, module) {
if (value && value.paneId === paneId) { // We have got an entry which needs merge
// Before modifying the actual pane info check if an entry exists with same target pane
index = _.findIndex(_mrofList, function (record) {
return (record.file === value.file && record.paneId === targetPaneId);
return (record && record.file === value.file && record.paneId === targetPaneId);
});
if (index !== -1) { // A duplicate entry found, remove the current one instead of updating
_mrofList[index] = null;
Expand Down