diff --git a/app/views/dmsf_upload/_multi_upload.html.erb b/app/views/dmsf_upload/_multi_upload.html.erb index 30212712..d7e1877d 100644 --- a/app/views/dmsf_upload/_multi_upload.html.erb +++ b/app/views/dmsf_upload/_multi_upload.html.erb @@ -50,7 +50,6 @@ 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 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 %> @@ -67,8 +66,7 @@ '<%= form_url %>', '<%= max_file_size %>', '<%= max_file_count %>', - '<%= flash_url %>', - '<%= silver_light_url %>' + '<%= flash_url %>' ); } }); @@ -77,8 +75,7 @@ '<%= form_url %>', '<%= max_file_size %>', '<%= max_file_count %>', - '<%= flash_url %>', - '<%= silver_light_url %>' + '<%= flash_url %>' ); window.dmsfFileFieldCount = 1; <% end %> diff --git a/assets/javascripts/redmine_dmsf.js b/assets/javascripts/redmine_dmsf.js index ed2d35da..75afd042 100644 --- a/assets/javascripts/redmine_dmsf.js +++ b/assets/javascripts/redmine_dmsf.js @@ -156,11 +156,11 @@ function dmsfExpandRows(EL, parentRow, url) { } /* Plupload */ -function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl, silverLightUrl) { +function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl) { uploader.html('
'); uploader = $('div', uploader); uploader.plupload({ - runtimes : 'html5,flash,silverlight,html4', + runtimes : 'html5,flash,html4', url : formUrl, max_file_size : maxFileSize, max_file_count: maxFileCount, @@ -177,9 +177,7 @@ function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl, active: 'thumbs' }, // Flash settings - flash_swf_url : flashUrl, - // Silverlight settings - silverlight_xap_url : silverLightUrl + flash_swf_url : flashUrl }); $('.plupload_scroll', uploader).resizable({ handles: 's'