Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed Object.keys() usage. Now uses simple Array.push() to retrieve all keys.

Browse Source
This commit is contained in:
Valera Rozuvan
2013-04-22 18:09:25 +03:00
committed by Vasyl Nakvasiuk
parent 13bed39dde
commit 7b5d5a0499
1 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
common/lib/xmodule/xmodule/js/src/word_cloud/word_cloud_main.js
View File

@@ -16,43 +16,6 @@
(function (requirejs, require, define) {
define('WordCloudMain', ['logme'], function (logme) {
// To add compatible Object.keys support in older environments that do not natively support it.
//
// https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object/keys#Compatibility
if (!Object.keys) {
Object.keys = (function () {
var hasOwnProperty = Object.prototype.hasOwnProperty,
hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),
dontEnums = [
'toString',
'toLocaleString',
'valueOf',
'hasOwnProperty',
'isPrototypeOf',
'propertyIsEnumerable',
'constructor'
],
dontEnumsLength = dontEnums.length;
return function (obj) {
if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) throw new TypeError('Object.keys called on non-object');
var result = [];
for (var prop in obj) {
if (hasOwnProperty.call(obj, prop)) result.push(prop);
}
if (hasDontEnumBug) {
for (var i=0; i < dontEnumsLength; i++) {
if (hasOwnProperty.call(obj, dontEnums[i])) result.push(dontEnums[i]);
}
}
return result;
}
}());
};
/**
* @function WordCloudMain
*
@@ -244,8 +207,11 @@ define('WordCloudMain', ['logme'], function (logme) {
// Color words in different colors.
fill = d3.scale.category20(),
// Will be populated by words the user enetered.
studentWordsKeys = [],
// Comma separated string of user enetered words.
studentWordsStr = (Object.keys(response.student_words)).join(', '),
studentWordsStr,
// By default we do not scale.
scale = 1;
@@ -260,6 +226,11 @@ define('WordCloudMain', ['logme'], function (logme) {
);
}
$.each(response.student_words, function (word, stat) {
studentWordsKeys.push(word);
});
studentWordsStr = '' + studentWordsKeys.join(', ');
this.wordCloudEl.find('.result_cloud_section').addClass('active');
this.wordCloudEl.find('.result_cloud_section').find('.your_words').html(studentWordsStr);