Fix eslint errors
This commit is contained in:
parent
2962436522
commit
24089d4fc3
2 changed files with 27 additions and 27 deletions
|
@ -291,7 +291,7 @@ const backgroundLogic = {
|
||||||
// Reject already moved tabs.
|
// Reject already moved tabs.
|
||||||
let oldIndices = movingIds.map(id => sortedIds.indexOf(id));
|
let oldIndices = movingIds.map(id => sortedIds.indexOf(id));
|
||||||
movingIds = movingIds.filter((id, index) => oldIndices[index] > -1);
|
movingIds = movingIds.filter((id, index) => oldIndices[index] > -1);
|
||||||
if (movingIds.length == 0)
|
if (movingIds.length === 0)
|
||||||
continue;
|
continue;
|
||||||
oldIndices = oldIndices.filter(index => index > -1);
|
oldIndices = oldIndices.filter(index => index > -1);
|
||||||
if (oldIndices[0] < newIndex)
|
if (oldIndices[0] < newIndex)
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
This version is simplified for the usecase:
|
This version is simplified for the usecase:
|
||||||
- comparison of arrays
|
- comparison of arrays
|
||||||
- synchronous function call
|
- synchronous function call
|
||||||
- equality of elements can be detected via the "==" operator
|
- equality of elements can be detected via the "===" operator
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
Software License Agreement (BSD License)
|
Software License Agreement (BSD License)
|
||||||
|
@ -39,18 +39,18 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI
|
||||||
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
window.Diff = {
|
const Diff = {
|
||||||
diff(oldValues, newValues) {
|
diff(oldValues, newValues) {
|
||||||
oldValues = oldValues.slice();
|
oldValues = oldValues.slice();
|
||||||
newValues = newValues.slice();
|
newValues = newValues.slice();
|
||||||
|
|
||||||
let newLen = newValues.length, oldLen = oldValues.length;
|
const newLen = newValues.length, oldLen = oldValues.length;
|
||||||
let editLength = 1;
|
let editLength = 1;
|
||||||
let maxEditLength = newLen + oldLen;
|
const maxEditLength = newLen + oldLen;
|
||||||
let bestPath = [{ newPos: -1, components: [] }];
|
const bestPath = [{ newPos: -1, components: [] }];
|
||||||
|
|
||||||
// Seed editLength = 0, i.e. the content starts with the same values
|
// Seed editLength = 0, i.e. the content starts with the same values
|
||||||
let oldPos = this.extractCommon(bestPath[0], newValues, oldValues, 0);
|
const oldPos = this.extractCommon(bestPath[0], newValues, oldValues, 0);
|
||||||
if (bestPath[0].newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
|
if (bestPath[0].newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
|
||||||
// Identity per the equality
|
// Identity per the equality
|
||||||
return [{value: newValues, count: newValues.length}];
|
return [{value: newValues, count: newValues.length}];
|
||||||
|
@ -60,16 +60,16 @@ window.Diff = {
|
||||||
function execEditLength() {
|
function execEditLength() {
|
||||||
for (let diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {
|
for (let diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {
|
||||||
let basePath;
|
let basePath;
|
||||||
let addPath = bestPath[diagonalPath - 1],
|
const addPath = bestPath[diagonalPath - 1];
|
||||||
removePath = bestPath[diagonalPath + 1],
|
const removePath = bestPath[diagonalPath + 1];
|
||||||
oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
|
let oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
|
||||||
if (addPath) {
|
if (addPath) {
|
||||||
// No one else is going to attempt to use this value, clear it
|
// No one else is going to attempt to use this value, clear it
|
||||||
bestPath[diagonalPath - 1] = undefined;
|
bestPath[diagonalPath - 1] = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
let canAdd = addPath && addPath.newPos + 1 < newLen,
|
const canAdd = addPath && addPath.newPos + 1 < newLen;
|
||||||
canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
|
const canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
|
||||||
if (!canAdd && !canRemove) {
|
if (!canAdd && !canRemove) {
|
||||||
// If this path is a terminal then prune
|
// If this path is a terminal then prune
|
||||||
bestPath[diagonalPath] = undefined;
|
bestPath[diagonalPath] = undefined;
|
||||||
|
@ -103,7 +103,7 @@ window.Diff = {
|
||||||
}
|
}
|
||||||
|
|
||||||
while (editLength <= maxEditLength) {
|
while (editLength <= maxEditLength) {
|
||||||
let ret = execEditLength.call(this);
|
const ret = execEditLength.call(this);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -111,7 +111,7 @@ window.Diff = {
|
||||||
},
|
},
|
||||||
|
|
||||||
pushComponent(components, added, removed) {
|
pushComponent(components, added, removed) {
|
||||||
let last = components[components.length - 1];
|
const last = components[components.length - 1];
|
||||||
if (last && last.added === added && last.removed === removed) {
|
if (last && last.added === added && last.removed === removed) {
|
||||||
// We need to clone here as the component clone operation is just
|
// We need to clone here as the component clone operation is just
|
||||||
// as shallow array clone
|
// as shallow array clone
|
||||||
|
@ -121,13 +121,13 @@ window.Diff = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
extractCommon(basePath, newValues, oldValues, diagonalPath) {
|
extractCommon(basePath, newValues, oldValues, diagonalPath) {
|
||||||
let newLen = newValues.length,
|
const newLen = newValues.length;
|
||||||
oldLen = oldValues.length,
|
const oldLen = oldValues.length;
|
||||||
newPos = basePath.newPos,
|
let newPos = basePath.newPos;
|
||||||
oldPos = newPos - diagonalPath,
|
let oldPos = newPos - diagonalPath;
|
||||||
|
|
||||||
commonCount = 0;
|
let commonCount = 0;
|
||||||
while (newPos + 1 < newLen && oldPos + 1 < oldLen && newValues[newPos + 1] == oldValues[oldPos + 1]) {
|
while (newPos + 1 < newLen && oldPos + 1 < oldLen && newValues[newPos + 1] === oldValues[oldPos + 1]) {
|
||||||
newPos++;
|
newPos++;
|
||||||
oldPos++;
|
oldPos++;
|
||||||
commonCount++;
|
commonCount++;
|
||||||
|
@ -142,18 +142,18 @@ window.Diff = {
|
||||||
},
|
},
|
||||||
|
|
||||||
_buildValues(components, newValues, oldValues, useLongestToken) {
|
_buildValues(components, newValues, oldValues, useLongestToken) {
|
||||||
let componentPos = 0,
|
let componentPos = 0;
|
||||||
componentLen = components.length,
|
const componentLen = components.length;
|
||||||
newPos = 0,
|
let newPos = 0;
|
||||||
oldPos = 0;
|
let oldPos = 0;
|
||||||
|
|
||||||
for (; componentPos < componentLen; componentPos++) {
|
for (; componentPos < componentLen; componentPos++) {
|
||||||
let component = components[componentPos];
|
const component = components[componentPos];
|
||||||
if (!component.removed) {
|
if (!component.removed) {
|
||||||
if (!component.added && useLongestToken) {
|
if (!component.added && useLongestToken) {
|
||||||
let value = newValues.slice(newPos, newPos + component.count);
|
let value = newValues.slice(newPos, newPos + component.count);
|
||||||
value = value.map(function(value, i) {
|
value = value.map(function(value, i) {
|
||||||
let oldValue = oldValues[oldPos + i];
|
const oldValue = oldValues[oldPos + i];
|
||||||
return oldValue.length > value.length ? oldValue : value;
|
return oldValue.length > value.length ? oldValue : value;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@ window.Diff = {
|
||||||
// The diffing algorithm is tied to add then remove output and this is the simplest
|
// The diffing algorithm is tied to add then remove output and this is the simplest
|
||||||
// route to get the desired output with minimal overhead.
|
// route to get the desired output with minimal overhead.
|
||||||
if (componentPos && components[componentPos - 1].added) {
|
if (componentPos && components[componentPos - 1].added) {
|
||||||
let tmp = components[componentPos - 1];
|
const tmp = components[componentPos - 1];
|
||||||
components[componentPos - 1] = components[componentPos];
|
components[componentPos - 1] = components[componentPos];
|
||||||
components[componentPos] = tmp;
|
components[componentPos] = tmp;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue