redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fixed Issue 99: Upload doesn't works correctly in different browsers

Browse Source 
* for opera by skipping flash runtime

git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@189 5e329b0b-a2ee-ea63-e329-299493fc886d
This commit is contained in:
vit.jonas@gmail.com 2011-07-06 17:09:55 +00:00
parent e8ba30e6f8
commit bcfd9d6849
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/dmsf/_multi_upload.html.erb
View File

@ -65,6 +65,7 @@
</script> </script>
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= javascript_include_tag "bowser.min.js", :plugin => "redmine_dmsf" %>
<%= javascript_include_tag "plupload/plupload.js", :plugin => "redmine_dmsf" %> <%= javascript_include_tag "plupload/plupload.js", :plugin => "redmine_dmsf" %>
<%= javascript_include_tag "plupload/plupload.flash.js", :plugin => "redmine_dmsf" %> <%= javascript_include_tag "plupload/plupload.flash.js", :plugin => "redmine_dmsf" %>
<%= javascript_include_tag "plupload/plupload.gears.js", :plugin => "redmine_dmsf" %> <%= javascript_include_tag "plupload/plupload.gears.js", :plugin => "redmine_dmsf" %>

12
assets/javascripts/bowser.min.js vendored Normal file
View File

@ -0,0 +1,12 @@
/*!
* Bowser - a browser detector
* copyright Dustin Diaz 2011
* https://github.com/ded/bowser
* MIT License
*//*!
* Bowser - a browser detector
* copyright Dustin Diaz 2011
* https://github.com/ded/bowser
* MIT License
*/
!function(a){function i(){if(c)return{msie:1,version:b.match(/msie (\d+(\.\d+)?);/i)[1]};if(d)return{webkit:1,chrome:1,version:b.match(/chrome\/(\d+(\.\d+)?)/i)[1]};if(e)return{webkit:1,safari:1,version:b.match(/version\/(\d+(\.\d+)?)/i)[1]};if(f)return{opera:1,version:b.match(/version\/(\d+(\.\d+)?)/i)[1]};if(h){var a={gecko:1,version:b.match(/firefox\/(\d+(\.\d+)?)/i)[1]};g&&(a.firefox=1);return a}}var b=navigator.userAgent,c=/msie/i.test(b),d=/chrome/i.test(b),e=/safari/i.test(b)&&!d,f=/opera/i.test(b),g=/firefox/i.test(b),h=/gecko\//i.test(b),j=i();j.msie&&j.version>=6||j.chrome&&j.version>=8||j.firefox&&j.version>=3.6||j.safari&&j.version>=5||j.opera&&j.version>=9.5?j.a=!0:j.msie&&j.version<6||j.chrome&&j.version<8||j.firefox&&j.version<3.6||j.safari&&j.version<5||j.opera&&j.version<9.5?j.c=!0:j.x=!0,typeof module!="undefined"&&module.exports?module.exports.browser=j:a.bowser=j}(this)

5
assets/javascripts/plupload/plupload.flash.js
View File

@ -90,6 +90,11 @@
init : function(uploader, callback) { init : function(uploader, callback) {
var browseButton, flashContainer, flashVars, waitCount = 0, container = document.body; var browseButton, flashContainer, flashVars, waitCount = 0, container = document.body;
if (bowser.opera) {
callback({success : false});
return;
}
if (getFlashVersion() < 10) { if (getFlashVersion() < 10) {
callback({success : false}); callback({success : false});
return; return;