Henning Snater has submitted this change and it was merged.

Change subject: Implements option for locking snaktype in snakview widget
......................................................................


Implements option for locking snaktype in snakview widget

Removes the related TODO.

Change-Id: Ief559fc82c582669acde4def61e7538d3b3a75d4
---
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
1 file changed, 9 insertions(+), 6 deletions(-)

Approvals:
  Henning Snater: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
index f35bafa..dae9105 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
@@ -20,8 +20,8 @@
  *         overwritten later, by using the value() or snak() functions.
  *         Default: { property: null, snaktype: wb.PropertyValueSnak.TYPE }
  *
- * @option locked {Object|boolean} Key-value pairs determining which snakview 
elements to lock. May
- *         also be a boolean value enabling/disabling all elements.
+ * @option locked {Object|boolean} Key-value pairs determining which snakview 
elements to lock for
+ *         being edited by the user. May also be a boolean value 
enabling/disabling all elements.
  *         Default: false (no elements to be locked)
  *
  * @option autoStartEditing {boolean} Whether or not view should go into edit 
mode by its own upon
@@ -67,8 +67,7 @@
                },
                locked: {
                        property: false,
-                       snaktype: false // TODO: Implement
-                       // TODO: Implement mechanism to lock elements of the 
variation
+                       snaktype: false
                },
                autoStartEditing: true
        },
@@ -762,12 +761,16 @@
                var snakTypes = 
$.wikibase.snakview.variations.getCoveredSnakTypes(),
                        selector = this._getSnakTypeSelector();
 
-               if( !this.isInEditMode() || snakTypes.length <= 1 ) {
+               if(
+                       !this.isInEditMode()
+                       || snakTypes.length <= 1
+                       || this.options.locked.snaktype
+               ) {
                        if( selector ) {
                                selector.destroy();
                        }
                        this.$snakTypeSelector.empty();
-                       return; // no type selector required in non-edit mode!
+                       return; // No type selector required!
                }
 
                if( !selector ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/89111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief559fc82c582669acde4def61e7538d3b3a75d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner <daniel.wer...@wikimedia.de>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to