Fix word cloud.

app/models/video_pro_setting.rb

@@ -34,7 +34,10 @@ class VideoProSetting
         if post_agency_was.present?
           video_image.title_translations.each do |k, v|
             tmp2 = tmp[k]
-            tmp2 = [] if tmp2.nil?
+            if tmp2.nil?
+              tmp2 = []
+              tmp[k] = tmp2
+            end
             if v.present? && tmp2.include?(post_agency_was) && VideoImage.where(:id.ne=>video_image.id, :override_post_agency=>post_agency_was, :use_override_post_agency=>true).count == 0
               save_flag = true
               tmp2.delete(post_agency_was)
@@ -45,7 +48,10 @@ class VideoProSetting
           video_image.title_translations.each do |k, v|
             if v.present?
               tmp2 = tmp[k]
-              tmp2 = [] if tmp2.nil?
+              if tmp2.nil?
+                tmp2 = []
+                tmp[k] = tmp2
+              end
               save_flag = true
               tmp2 << post_agency unless tmp2.include?(post_agency)
             end
@@ -61,7 +67,10 @@ class VideoProSetting
         if user_id_was.present?
           video_image.title_was.each do |k, v|
             tmp2 = tmp[k]
-            tmp2 = [] if tmp2.nil?
+            if tmp2.nil?
+              tmp2 = []
+              tmp[k] = tmp2
+            end
             if v.present? && tmp2.include?(user_id_was) && VideoImage.where(:id.ne=>video_image.id, :update_user_id=>user_id_was, :use_override_post_agency=>false).count == 0
               save_flag = true
               tmp2.delete(user_id_was)
@@ -71,7 +80,10 @@ class VideoProSetting
         video_image.title_translations.each do |k, v|
           if v.present?
             tmp2 = tmp[k]
-            tmp2 = [] if tmp2.nil?
+            if tmp2.nil?
+              tmp2 = []
+              tmp[k] = tmp2
+            end
             save_flag = true
             tmp2 << user_id unless tmp2.include?(user_id)
           end
@@ -90,7 +102,10 @@ class VideoProSetting
         video_image.title_translations.each do |k, v|
           if v.present?
             tmp2 = tmp[k]
-            tmp2 = [] if tmp2.nil?
+            if tmp2.nil?
+              tmp2 = []
+              tmp[k] = tmp2
+            end
             save_flag = true
             tmp2 << post_agency unless tmp2.include?(post_agency)
           end
@@ -103,7 +118,10 @@ class VideoProSetting
       video_image.title_translations.each do |k, v|
         if v.present?
           tmp2 = tmp[k]
-          tmp2 = [] if tmp2.nil?
+          if tmp2.nil?
+            tmp2 = []
+            tmp[k] = tmp2
+          end
           save_flag = true
           tmp2 << user_id unless tmp2.include?(user_id)
         end
@@ -120,7 +138,10 @@ class VideoProSetting
       if post_agency.present?
         video_image.title_translations.each do |k, v|
           tmp2 = tmp[k]
-          tmp2 = [] if tmp2.nil?
+          if tmp2.nil?
+            tmp2 = []
+            tmp[k] = tmp2
+          end
           if v.present? && tmp2.include?(post_agency) && VideoImage.where(:id.ne=>video_image.id, :override_post_agency=>post_agency, :use_override_post_agency=>true).count == 0
             save_flag = true
             tmp2.delete(post_agency)
@@ -133,7 +154,10 @@ class VideoProSetting
       tmp = self.exist_user_ids_translations
       video_image.title_translations.each do |k, v|
         tmp2 = tmp[k]
-        tmp2 = [] if tmp2.nil?
+        if tmp2.nil?
+          tmp2 = []
+          tmp[k] = tmp2
+        end
         if v.present? && tmp2.include?(user_id) && VideoImage.where(:id.ne=>video_image.id, :update_user_id=>user_id, :use_override_post_agency=>false).count == 0
           save_flag = true
           tmp2.delete(user_id)

modules/video_pro/_video_pro_widget_jqcloud1.html.erb

@@ -1,33 +1,46 @@
 <div class="w-video_data video_data-widget-2">
   <%= javascript_include_tag 'video_pro/wordcloud2.js' %>
-  <div style="width: 100%; height: 60vw" class="my_favorite_latin_words jqcloud"><div>
+  <div style="width: 100%; height: 40vw" class="my_favorite_latin_words jqcloud wordcloud2"><div>
   <script>
+    var container_{{subpart-id}} = $('[data-subpart-id="{{subpart-id}}"] .my_favorite_latin_words');
+    var width_{{subpart-id}} = container_{{subpart-id}}.width();
+    container_{{subpart-id}}.attr('width', width_{{subpart-id}})
+    var jqcloud_words_{{subpart-id}} = {{jqcloud_words}};
+    var text_map_{{subpart-id}} = {};
+    var max_value_{{subpart-id}} = 1;
+    $.each(jqcloud_words_{{subpart-id}}, function(i, v){
+      if (max_value_{{subpart-id}} < v.weight){
+        max_value_{{subpart-id}} = v.weight;
+      }
+    });
+    var list_{{subpart-id}} = $.map(jqcloud_words_{{subpart-id}}, function(v){
+      text_map_{{subpart-id}}[v.text] = v.link;
+      return [[v.text, Math.ceil(v.weight/max_value_{{subpart-id}}*3), v.link]];
+    });
+    container_{{subpart-id}}.on('wordcloudstop', function (e) {
+      $(this).children('span').each(function (i, v) {
+        var text = $(this).html();
+        $(this).html('<a title="'+ list_{{subpart-id}}[i][0] + '" style="color: inherit" href="' + list_{{subpart-id}}[i][2]  +'">' + text + '</a>');
+      });
+    });
     $(document).ready(function(){
-      var container = $('[data-subpart-id="{{subpart-id}}"] .my_favorite_latin_words');
-      var width = container.width();
-      container.attr('width', width)
-      var jqcloud_words = {{jqcloud_words}};
-      var text_map = {};
-      var max_value = 1;
-      $.each(jqcloud_words, function(i, v){
-        if (max_value < v.weight){
-          max_value = v.weight;
-        }
-      });
-      var list = $.map(jqcloud_words, function(v){
-        text_map[v.text] = v.link;
-        return [[v.text, Math.ceil(v.weight/max_value*3), v.link]];
-      });
-      container.on('wordcloudstop', function (e) {
-        $(this).children('span').each(function (i, v) {
-          var text = $(this).html();
-          $(this).html('<a title="'+ list[i][0] + '" style="color: inherit" href="' + list[i][2]  +'">' + text + '</a>');
-        });
-      });
-      WordCloud(container[0], {
-        list: list,
+      WordCloud(container_{{subpart-id}}[0], {
+        list: list_{{subpart-id}},
         gridSize: 3,
-        weightFactor: jqcloud_words.length * width / 550,
+        weightFactor: jqcloud_words_{{subpart-id}}.length * width_{{subpart-id}} / 550,
+        rotateRatio: 0,
+        shuffle: false,
+        drawOutOfBound: false,
+        shrinkToFit: true,
+        shape: 'square'
+      });
+    })
+    $(window).resize(function(){
+      width_{{subpart-id}} = container_{{subpart-id}}.width();
+      WordCloud(container_{{subpart-id}}[0], {
+        list: list_{{subpart-id}},
+        gridSize: 3,
+        weightFactor: jqcloud_words_{{subpart-id}}.length * width_{{subpart-id}} / 550,
         rotateRatio: 0,
         shuffle: false,
         drawOutOfBound: false,
@@ -36,4 +49,4 @@
       });
     })
   </script>
-</div>
+</div>