chiu
/
video_pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chiu:431e3f9f4c9cde0169cf4b9f841e451b6b0cfe41
Branches Tags
chiu:master
..
compare: chiu:e774fccd557e4932202128d852ab3522f482cd68
Branches Tags
chiu:master

No commits in common. "431e3f9f4c9cde0169cf4b9f841e451b6b0cfe41" and "e774fccd557e4932202128d852ab3522f482cd68" have entirely different histories.
431e3f9f4c ... e774fccd55

2 changed files with 33 additions and 70 deletions
Show Stats Expand all files Collapse all files

40
app/models/video_pro_setting.rb
View File

@ -34,10 +34,7 @@ class VideoProSetting
if post_agency_was.present? if post_agency_was.present?
video_image.title_translations.each do |k, v| video_image.title_translations.each do |k, v|
tmp2 = tmp[k] tmp2 = tmp[k]
if tmp2.nil? tmp2 = [] 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 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 save_flag = true
tmp2.delete(post_agency_was) tmp2.delete(post_agency_was)
@ -48,10 +45,7 @@ class VideoProSetting
video_image.title_translations.each do |k, v| video_image.title_translations.each do |k, v|
if v.present? if v.present?
tmp2 = tmp[k] tmp2 = tmp[k]
if tmp2.nil? tmp2 = [] if tmp2.nil?
tmp2 = []
tmp[k] = tmp2
end
save_flag = true save_flag = true
tmp2 << post_agency unless tmp2.include?(post_agency) tmp2 << post_agency unless tmp2.include?(post_agency)
end end
@ -67,10 +61,7 @@ class VideoProSetting
if user_id_was.present? if user_id_was.present?
video_image.title_was.each do |k, v| video_image.title_was.each do |k, v|
tmp2 = tmp[k] tmp2 = tmp[k]
if tmp2.nil? tmp2 = [] 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 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 save_flag = true
tmp2.delete(user_id_was) tmp2.delete(user_id_was)
@ -80,10 +71,7 @@ class VideoProSetting
video_image.title_translations.each do |k, v| video_image.title_translations.each do |k, v|
if v.present? if v.present?
tmp2 = tmp[k] tmp2 = tmp[k]
if tmp2.nil? tmp2 = [] if tmp2.nil?
tmp2 = []
tmp[k] = tmp2
end
save_flag = true save_flag = true
tmp2 << user_id unless tmp2.include?(user_id) tmp2 << user_id unless tmp2.include?(user_id)
end end
@ -102,10 +90,7 @@ class VideoProSetting
video_image.title_translations.each do |k, v| video_image.title_translations.each do |k, v|
if v.present? if v.present?
tmp2 = tmp[k] tmp2 = tmp[k]
if tmp2.nil? tmp2 = [] if tmp2.nil?
tmp2 = []
tmp[k] = tmp2
end
save_flag = true save_flag = true
tmp2 << post_agency unless tmp2.include?(post_agency) tmp2 << post_agency unless tmp2.include?(post_agency)
end end
@ -118,10 +103,7 @@ class VideoProSetting
video_image.title_translations.each do |k, v| video_image.title_translations.each do |k, v|
if v.present? if v.present?
tmp2 = tmp[k] tmp2 = tmp[k]
if tmp2.nil? tmp2 = [] if tmp2.nil?
tmp2 = []
tmp[k] = tmp2
end
save_flag = true save_flag = true
tmp2 << user_id unless tmp2.include?(user_id) tmp2 << user_id unless tmp2.include?(user_id)
end end
@ -138,10 +120,7 @@ class VideoProSetting
if post_agency.present? if post_agency.present?
video_image.title_translations.each do |k, v| video_image.title_translations.each do |k, v|
tmp2 = tmp[k] tmp2 = tmp[k]
if tmp2.nil? tmp2 = [] 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 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 save_flag = true
tmp2.delete(post_agency) tmp2.delete(post_agency)
@ -154,10 +133,7 @@ class VideoProSetting
tmp = self.exist_user_ids_translations tmp = self.exist_user_ids_translations
video_image.title_translations.each do |k, v| video_image.title_translations.each do |k, v|
tmp2 = tmp[k] tmp2 = tmp[k]
if tmp2.nil? tmp2 = [] 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 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 save_flag = true
tmp2.delete(user_id) tmp2.delete(user_id)

61
modules/video_pro/_video_pro_widget_jqcloud1.html.erb
View File

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