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

Javascript defer = true

Browse Source
This commit is contained in:
Karel Picman 2018-03-14 16:07:12 +01:00
parent 7f14c71550
commit a69b2bdad5
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/dmsf/show.html.erb
View File

@ -125,8 +125,8 @@
<%= context_menu %>
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'jquery.dataTables/datatables.min.css', :plugin => 'redmine_dmsf' %>
<%= javascript_include_tag 'jquery.dataTables/datatables.min.js', :plugin => 'redmine_dmsf' %>
<%= stylesheet_link_tag 'jquery.dataTables/datatables.min.css', :plugin => :redmine_dmsf %>
<%= javascript_include_tag 'jquery.dataTables/datatables.min.js', :plugin => :redmine_dmsf, defer: true %>
<% title = DmsfFolder.get_column_position('title') %>
<% position = DmsfFolder.get_column_position('position') %>

4
app/views/dmsf/trash.html.erb
View File

@ -170,8 +170,8 @@
<%= context_menu %>
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'jquery.dataTables/datatables.min.css', :plugin => 'redmine_dmsf' %>
<%= javascript_include_tag 'jquery.dataTables/datatables.min.js', :plugin => 'redmine_dmsf' %>
<%= stylesheet_link_tag 'jquery.dataTables/datatables.min.css', :plugin => :redmine_dmsf %>
<%= javascript_include_tag 'jquery.dataTables/datatables.min.js', :plugin => :redmine_dmsf, defer: true %>
<% title = DmsfFolder.get_column_position('title') %>
<% position = DmsfFolder.get_column_position('position') %>

4
app/views/dmsf_files/show.html.erb
View File

@ -220,6 +220,6 @@
<% end %>
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'jquery.dataTables/datatables.min.css', :plugin => 'redmine_dmsf' %>
<%= javascript_include_tag 'jquery.dataTables/datatables.min.js', :plugin => 'redmine_dmsf' %>
<%= stylesheet_link_tag 'jquery.dataTables/datatables.min.css', :plugin => :redmine_dmsf %>
<%= javascript_include_tag 'jquery.dataTables/datatables.min.js', :plugin => :redmine_dmsf, defer: true %>
<% end %>

25
app/views/dmsf_upload/_multi_upload.html.erb
View File

@ -45,8 +45,7 @@
</div>
<% end %>
<%# TODO: late_javascript_tag is not working here %>
<%= javascript_tag do %>
<%= late_javascript_tag do %>
var originalUploaderContent;
var uploader = $('#dmsf_uploader');
originalUploaderContent = uploader.html();
@ -59,15 +58,15 @@
}
});
initPlUploader(uploader);
var dmsfFileFieldCount = 1;
window.dmsfFileFieldCount = 1;
<% end %>
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'plupload/jquery.ui.plupload.css', :plugin => 'redmine_dmsf' %>
<%= javascript_include_tag 'plupload/js/plupload.full.min.js', :plugin => 'redmine_dmsf' %>
<%= javascript_include_tag 'plupload/js/jquery.ui.plupload/jquery.ui.plupload.js', :plugin => 'redmine_dmsf' %>
<%= javascript_include_tag(js_url, :plugin => 'redmine_dmsf') %>
<%= javascript_tag do %>
<%= stylesheet_link_tag 'plupload/jquery.ui.plupload.css', :plugin => :redmine_dmsf %>
<%= javascript_include_tag 'plupload/js/plupload.full.min.js', :plugin => :redmine_dmsf, defer: true %>
<%= javascript_include_tag 'plupload/js/jquery.ui.plupload/jquery.ui.plupload.js', :plugin => :redmine_dmsf, defer: true %>
<%= javascript_include_tag(js_url, :plugin => :redmine_dmsf, defer: true) %>
<%= late_javascript_tag do %>
function initPlUploader(uploader) {
uploader.html('<div></div>');
uploader = $('div', uploader);
@ -107,19 +106,19 @@
} else {
if (responseObject.error == null) {
var disk_filename_input = $('<input/>').attr('type', 'hidden')
.attr('name', 'uploaded[' + dmsfFileFieldCount + '][disk_filename]')
.attr('name', 'uploaded[' + window.dmsfFileFieldCount + '][disk_filename]')
.val(responseObject.disk_filename);
uploader.append(disk_filename_input);
var content_type_input = $('<input/>').attr('type', 'hidden')
.attr('name', 'uploaded[' + dmsfFileFieldCount + '][content_type]')
.attr('name', 'uploaded[' + window.dmsfFileFieldCount + '][content_type]')
.val(responseObject.content_type);
uploader.append(content_type_input);
var original_filename_input = $('<input/>').attr('type', 'hidden')
.attr('name', 'uploaded[' + dmsfFileFieldCount + '][original_filename]')
.attr('name', 'uploaded[' + window.dmsfFileFieldCount + '][original_filename]')
.val(responseObject.original_filename);
uploader.append(original_filename_input);
var tempfile_path = $('<input/>').attr('type', 'hidden')
.attr('name', 'uploaded[' + dmsfFileFieldCount + '][tempfile_path]')
.attr('name', 'uploaded[' + window.dmsfFileFieldCount + '][tempfile_path]')
.val(responseObject.tempfile_path);
uploader.append(tempfile_path);
} else {
@ -130,7 +129,7 @@
}
if(pluploader.total.uploaded == pluploader.files.length) $('#uploadform').submit();
else if((pluploader.total.uploaded + pluploader.total.failed) == pluploader.files.length) setTimeout(function() {$('#uploadform').submit();}, 2000);
else dmsfFileFieldCount++;
else window.dmsfFileFieldCount++;
return true;
});
}

6
lib/redmine_dmsf/hooks/views/base_view_hooks.rb
View File

@ -28,9 +28,9 @@ module RedmineDmsf
return if defined?(EasyExtensions)
"\n".html_safe + stylesheet_link_tag('redmine_dmsf.css', :plugin => :redmine_dmsf) +
"\n".html_safe + stylesheet_link_tag('select2.min.css', :plugin => :redmine_dmsf) +
"\n".html_safe + javascript_include_tag('select2.min.js', :plugin => :redmine_dmsf) +
"\n".html_safe + javascript_include_tag('redmine_dmsf.js', :plugin => :redmine_dmsf) +
"\n".html_safe + javascript_include_tag('attachments_dmsf.js', :plugin => :redmine_dmsf)
"\n".html_safe + javascript_include_tag('select2.min.js', :plugin => :redmine_dmsf, defer: true) +
"\n".html_safe + javascript_include_tag('redmine_dmsf.js', :plugin => :redmine_dmsf, defer: true) +
"\n".html_safe + javascript_include_tag('attachments_dmsf.js', :plugin => :redmine_dmsf, defer: true)
end
def easy_extensions_javascripts_hook(context={})