Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70039
Change subject: Clean up: Use `.jquery` instead of `instanceof jQuery`
......................................................................
Clean up: Use `.jquery` instead of `instanceof jQuery`
Also updated documentation for the two methods that used
this that were character-by-character identical.
Change-Id: Ie4103577d8a8fae8026d0110b9f384ebaad4fa0c
---
M modules/ve/ui/elements/ve.ui.LabeledElement.js
M modules/ve/ui/tools/ve.ui.DropdownTool.js
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/39/70039/1
diff --git a/modules/ve/ui/elements/ve.ui.LabeledElement.js
b/modules/ve/ui/elements/ve.ui.LabeledElement.js
index d4bbe50..b35d703 100644
--- a/modules/ve/ui/elements/ve.ui.LabeledElement.js
+++ b/modules/ve/ui/elements/ve.ui.LabeledElement.js
@@ -33,6 +33,8 @@
/**
* Set the label.
*
+ * If the label value is empty, undefined or only contains whitespace an empty
label will be used.
+ *
* @method
* @param {jQuery|string} [value] jQuery HTML node selection or string text
value to use for label
* @chainable
@@ -40,7 +42,7 @@
ve.ui.LabeledElement.prototype.setLabel = function ( value ) {
if ( typeof value === 'string' && value.length && /[^\s]*/.test( value
) ) {
this.$label.text( value );
- } else if ( value instanceof jQuery ) {
+ } else if ( value.jquery ) {
this.$label.empty().append( value );
} else {
this.$label.html( ' ' );
diff --git a/modules/ve/ui/tools/ve.ui.DropdownTool.js
b/modules/ve/ui/tools/ve.ui.DropdownTool.js
index 801b04c..a4d24ad 100644
--- a/modules/ve/ui/tools/ve.ui.DropdownTool.js
+++ b/modules/ve/ui/tools/ve.ui.DropdownTool.js
@@ -137,13 +137,13 @@
* If the label value is empty, undefined or only contains whitespace an empty
label will be used.
*
* @method
- * @param {jQuery|string} [value] Label text
+ * @param {jQuery|string} [value] jQuery HTML node selection or string text
value to use for label
* @chainable
*/
ve.ui.DropdownTool.prototype.setLabel = function ( value ) {
if ( typeof value === 'string' && value.length && /[^\s]*/.test( value
) ) {
this.$labelText.text( value );
- } else if ( value instanceof jQuery ) {
+ } else if ( value.jquery ) {
this.$labelText.empty().append( value );
} else {
this.$labelText.html( ' ' );
--
To view, visit https://gerrit.wikimedia.org/r/70039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4103577d8a8fae8026d0110b9f384ebaad4fa0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
