Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155545
Change subject: Update oo#compare usages
......................................................................
Update oo#compare usages
compare now allows comparisons to null/undefined.
Also as compare treats arrays as objects, when seeing if an array
is full of undefined's we don't need to construct a sparse array.
Change-Id: I34c5b2699982044e13943bb9b9f47c7a0f522e3b
---
M src/dm/ve.dm.Scalable.js
M src/dm/ve.dm.Transaction.js
2 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/45/155545/1
diff --git a/src/dm/ve.dm.Scalable.js b/src/dm/ve.dm.Scalable.js
index 5eb1639..c0778fa 100644
--- a/src/dm/ve.dm.Scalable.js
+++ b/src/dm/ve.dm.Scalable.js
@@ -209,7 +209,7 @@
ve.dm.Scalable.prototype.setCurrentDimensions = function ( dimensions ) {
if (
this.isDimensionsObjectValid( dimensions ) &&
- !ve.compare( dimensions, this.getCurrentDimensions() || {} )
+ !ve.compare( dimensions, this.getCurrentDimensions() )
) {
this.currentDimensions = ve.copy( dimensions );
// Only use current dimensions for ratio if it isn't set
@@ -232,7 +232,7 @@
ve.dm.Scalable.prototype.setOriginalDimensions = function ( dimensions ) {
if (
this.isDimensionsObjectValid( dimensions ) &&
- !ve.compare( dimensions, this.getOriginalDimensions() || {} )
+ !ve.compare( dimensions, this.getOriginalDimensions() )
) {
this.originalDimensions = ve.copy( dimensions );
// Always overwrite ratio
@@ -253,7 +253,7 @@
ve.dm.Scalable.prototype.setDefaultDimensions = function ( dimensions ) {
if (
this.isDimensionsObjectValid( dimensions ) &&
- !ve.compare( dimensions, this.getDefaultDimensions() || {} )
+ !ve.compare( dimensions, this.getDefaultDimensions() )
) {
this.defaultDimensions = ve.copy( dimensions );
this.valid = null;
@@ -311,7 +311,7 @@
ve.dm.Scalable.prototype.setMinDimensions = function ( dimensions ) {
if (
this.isDimensionsObjectValid( dimensions ) &&
- !ve.compare( dimensions, this.getMinDimensions() || {} )
+ !ve.compare( dimensions, this.getMinDimensions() )
) {
this.minDimensions = ve.copy( dimensions );
this.valid = null;
@@ -328,7 +328,7 @@
ve.dm.Scalable.prototype.setMaxDimensions = function ( dimensions ) {
if (
this.isDimensionsObjectValid( dimensions ) &&
- !ve.compare( dimensions, this.getMaxDimensions() || {} )
+ !ve.compare( dimensions, this.getMaxDimensions() )
) {
this.maxDimensions = ve.copy( dimensions );
this.emit( 'maxSizeChange', dimensions );
diff --git a/src/dm/ve.dm.Transaction.js b/src/dm/ve.dm.Transaction.js
index 03b38d7..cb5b2fe 100644
--- a/src/dm/ve.dm.Transaction.js
+++ b/src/dm/ve.dm.Transaction.js
@@ -1141,8 +1141,8 @@
range = new ve.Range( offset, offset + removeLength ),
remove = doc.getData( range ),
removeMetadata = doc.getMetadata( range ),
- isRemoveEmpty = ve.compare( removeMetadata, new Array(
removeMetadata.length ) ),
- isInsertEmpty = insertMetadata && ve.compare( insertMetadata,
new Array( insertMetadata.length ) );
+ isRemoveEmpty = ve.compare( removeMetadata, [] ),
+ isInsertEmpty = insertMetadata && ve.compare( insertMetadata,
[] );
if ( !insertMetadata && !isRemoveEmpty ) {
// if we are removing a range which includes metadata, we need
to
--
To view, visit https://gerrit.wikimedia.org/r/155545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34c5b2699982044e13943bb9b9f47c7a0f522e3b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
