jiang
/
ask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix jquery ui conflict

This commit is contained in:
chiu 2020-03-22 23:58:53 +08:00
parent e7302c8f34
commit 5ca7593a05
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/admin/asks_helper.rb
View File

@ -65,7 +65,7 @@ module Admin::AsksHelper
"<div class=\"datetime_selector\">#{t1}</div>
<script>
jQuery(document).ready(function( $ ) {
$(\"input[name='#{field_name}[datetime][date][#{i}]']\").ui_datetimepicker({controlType: 'select',timeInput: true,oneLine: true,timeFormat: 'HH:mm'});
$(\"input[name='#{field_name}[datetime][date][#{i}]']\").ui_datetimepicker({dateFormat: 'yy-mm-dd',controlType: 'select',timeInput: true,oneLine: true,timeFormat: 'HH:mm'});
})
</script>".html_safe
when 'format2'
@ -73,7 +73,7 @@ module Admin::AsksHelper
"<div class=\"datetime_selector\">#{t1}</div>
<script>
jQuery(document).ready(function( $ ) {
$(\"input[name='#{field_name}[datetime][date][#{i}]']\").ui_datepicker();
$(\"input[name='#{field_name}[datetime][date][#{i}]']\").ui_datepicker(dateFormat: 'yy-mm-dd');
})
</script>".html_safe
when 'format3'

4
app/views/admin/asks/_form.html.erb
View File

@ -9,9 +9,9 @@
<% end %>
<%# javascript_include_tag "lib/bootstrap-datetimepicker.js" %>
<%# javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"%>
<%= javascript_include_tag "/assets/lib/jquery-ui-1.12.1/jquery-ui.min" %>
<%# javascript_include_tag "/assets/lib/jquery-ui-1.12.1/jquery-ui.min" %>
<%# javascript_include_tag "lib/module-area" %>
<%= javascript_include_tag "jquery.ui.datepicker.monthyearpicker" %>
<%# javascript_include_tag "jquery.ui.datepicker.monthyearpicker" %>
<%# javascript_include_tag "lib/bootstrap-datetimepicker" %>
<style type="text/css">
.input-area tr td {

4
app/views/asks/index.html.erb
View File

@ -56,7 +56,7 @@
text-align: center;
}
</style>
<%= javascript_include_tag "/assets/lib/jquery-ui-1.12.1/jquery-ui.min" %>
<%# javascript_include_tag "/assets/lib/jquery-ui-1.12.1/jquery-ui.min" %>
<%= stylesheet_link_tag "/assets/lib/jquery-ui-1.12.1/jquery-ui.min" %>
<%= stylesheet_link_tag "custom_field" %>
<%= stylesheet_link_tag "jquery-ui-timepicker-addon" %>
@ -65,7 +65,7 @@
var datepicker = $.datepicker
</script>
<%# javascript_include_tag "lib/bootstrap-datetimepicker" %>
<%= javascript_include_tag "jquery.ui.datepicker.monthyearpicker" %>
<%# javascript_include_tag "jquery.ui.datepicker.monthyearpicker" %>
<%= javascript_include_tag 'validator' %>
<link href="/assets/ask/ask.css" media="screen" rel="stylesheet">

11
app/views/layouts/back_end_with_jquery_first.html.erb
View File

@ -1,9 +1,4 @@
<%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"%>
<%= javascript_include_tag "/assets/lib/jquery-ui-1.12.1/jquery-ui.min" %>
<script type="text/javascript">
var jq = $.noConflict()
var datepicker_fn = jq.fn.datepicker
var datepicker = jq.datepicker
</script>
<%# javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"%>
<%# javascript_include_tag "/assets/lib/jquery-ui-1.12.1/jquery-ui.min" %>
<%= render :template => 'layouts/back_end' %>
<%= stylesheet_link_tag "jquery-ui-timepicker-addon" %>
<%# stylesheet_link_tag "jquery-ui-timepicker-addon" %>