Merge branch 'master' into feature/christina/metadata-ui

2013-05-14 13:53:03 -04:00
parent 69832c57a9 2c1b0c831f
commit 5bd0442ffb
12 changed files with 78 additions and 52 deletions
--- a/common/lib/xmodule/xmodule/js/src/word_cloud/word_cloud_main.js
+++ b/common/lib/xmodule/xmodule/js/src/word_cloud/word_cloud_main.js
@@ -165,7 +165,7 @@ define('WordCloudMain', ['logme'], function (logme) {
        d3.layout.cloud().size([this.width, this.height])
            .words(words)
            .rotate(function () {
-                return Math.floor((Math.random() * 2) * 90);
+                return Math.floor((Math.random() * 2)) * 90;
            })
            .font('Impact')
            .fontSize(function (d) {