Refactor the object keys counter function

This commit is contained in:
Amir E. Aharoni
2015-03-14 23:20:09 +02:00
parent da9a849b42
commit c81561b3fc
3 changed files with 53 additions and 30 deletions

View File

@@ -53,6 +53,34 @@
</div>';
/*jshint multistr:false */
$.uls = $.uls || {};
$.uls.utils = {};
/**
* Count the number of keys in an object.
* Works in a cross-browser way.
* @param {Object} The object.
*/
$.uls.utils.objectLength = function ( obj ) {
var count, key;
// Some old browsers don't support Object.keys
if ( Object.keys ) {
return Object.keys( obj ).length;
}
count = 0;
for ( key in obj ) {
if ( Object.prototype.hasOwnProperty.call( obj, key ) ) {
count++;
}
}
return count;
};
/**
* ULS Public class definition
*/
@@ -354,26 +382,13 @@
* @return string
*/
getMenuWidth: function () {
var language,
languagesCount = 0;
var languagesCount;
if ( this.options.menuWidth ) {
return this.options.menuWidth;
}
// IE8 does not support Object.keys
if ( Object.keys ) {
languagesCount = Object.keys( this.options.languages ).length;
} else {
for ( language in this.options.languages ) {
if ( Object.prototype.hasOwnProperty.call(
this.options.languages,
language
) ) {
languagesCount++;
}
}
}
languagesCount = $.uls.utils.objectLength( this.options.languages );
if ( languagesCount < 12 ) {
return 'narrow';