Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/184619
Change subject: Use "obj.hasOwnProperty( prop )" instead of "prop in obj"
......................................................................
Use "obj.hasOwnProperty( prop )" instead of "prop in obj"
'constructor' in {}; // true
Object.prototype.hasOwnProperty( {}, 'constructor' ); // false
Bug: T86643
Change-Id: I4356608956d722dc086e6876a53fdd93435c6f0a
---
M modules/jquery.wikiEditor.js
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/19/184619/1
diff --git a/modules/jquery.wikiEditor.js b/modules/jquery.wikiEditor.js
index 55a55a8..7c67b8d 100644
--- a/modules/jquery.wikiEditor.js
+++ b/modules/jquery.wikiEditor.js
@@ -11,6 +11,8 @@
/*jshint onevar:false, boss:true */
( function ( $, mw ) {
+var hasOwn = Object.prototype.hasOwnProperty;
+
/**
* Global static object for wikiEditor that provides generally useful
functionality to all modules and contexts.
*/
@@ -168,7 +170,8 @@
*/
autoLang: function ( object, lang ) {
var defaultKey = $( 'body' ).hasClass( 'rtl' ) ? 'default-rtl'
: 'default';
- return object[lang || mw.config.get( 'wgUserLanguage' )] ||
object[defaultKey] || object['default'] || object;
+ lang = lang || mw.config.get( 'wgUserLanguage' );
+ return hasOwn.call( object, lang ) ? object[lang] :
object[defaultKey] || object['default'] || object;
},
/**
@@ -199,9 +202,9 @@
*/
autoIconOrOffset: function ( icon, offset, path, lang ) {
lang = lang || mw.config.get( 'wgUserLanguage' );
- if ( typeof offset === 'object' && lang in offset ) {
+ if ( typeof offset === 'object' && hasOwn.call( offset, lang )
) {
return offset[lang];
- } else if ( typeof icon === 'object' && lang in icon ) {
+ } else if ( typeof icon === 'object' && hasOwn.call( icon, lang
) ) {
return $.wikiEditor.autoIcon( icon, undefined, lang );
} else {
return $.wikiEditor.autoLang( offset, lang );
--
To view, visit https://gerrit.wikimedia.org/r/184619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4356608956d722dc086e6876a53fdd93435c6f0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
