Deprecate silverlight support? #1032

This commit is contained in:
Karel Pičman 2019-08-23 08:05:20 +02:00
parent 41ff3214be
commit 7f7140e90f
2 changed files with 5 additions and 10 deletions

View File

@ -50,7 +50,6 @@
max_file_size = "#{@ajax_upload_size}mb" max_file_size = "#{@ajax_upload_size}mb"
max_file_count = Setting.plugin_redmine_dmsf['dmsf_max_file_upload'].to_i if Setting.plugin_redmine_dmsf['dmsf_max_file_upload'].to_i > 0 max_file_count = Setting.plugin_redmine_dmsf['dmsf_max_file_upload'].to_i if Setting.plugin_redmine_dmsf['dmsf_max_file_upload'].to_i > 0
flash_url = plugin_asset_path(:redmine_dmsf, 'javascripts', 'plupload/js/Moxie.swf') flash_url = plugin_asset_path(:redmine_dmsf, 'javascripts', 'plupload/js/Moxie.swf')
silver_light_url = plugin_asset_path(:redmine_dmsf, 'javascripts', 'plupload/js/Moxie.xap')
%> %>
<%= late_javascript_tag do %> <%= late_javascript_tag do %>
@ -67,8 +66,7 @@
'<%= form_url %>', '<%= form_url %>',
'<%= max_file_size %>', '<%= max_file_size %>',
'<%= max_file_count %>', '<%= max_file_count %>',
'<%= flash_url %>', '<%= flash_url %>'
'<%= silver_light_url %>'
); );
} }
}); });
@ -77,8 +75,7 @@
'<%= form_url %>', '<%= form_url %>',
'<%= max_file_size %>', '<%= max_file_size %>',
'<%= max_file_count %>', '<%= max_file_count %>',
'<%= flash_url %>', '<%= flash_url %>'
'<%= silver_light_url %>'
); );
window.dmsfFileFieldCount = 1; window.dmsfFileFieldCount = 1;
<% end %> <% end %>

View File

@ -156,11 +156,11 @@ function dmsfExpandRows(EL, parentRow, url) {
} }
/* Plupload */ /* Plupload */
function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl, silverLightUrl) { function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl) {
uploader.html('<div></div>'); uploader.html('<div></div>');
uploader = $('div', uploader); uploader = $('div', uploader);
uploader.plupload({ uploader.plupload({
runtimes : 'html5,flash,silverlight,html4', runtimes : 'html5,flash,html4',
url : formUrl, url : formUrl,
max_file_size : maxFileSize, max_file_size : maxFileSize,
max_file_count: maxFileCount, max_file_count: maxFileCount,
@ -177,9 +177,7 @@ function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl,
active: 'thumbs' active: 'thumbs'
}, },
// Flash settings // Flash settings
flash_swf_url : flashUrl, flash_swf_url : flashUrl
// Silverlight settings
silverlight_xap_url : silverLightUrl
}); });
$('.plupload_scroll', uploader).resizable({ $('.plupload_scroll', uploader).resizable({
handles: 's' handles: 's'