commit a72bcddfae265159c199581598e674283b9895d4 Author: root Date: Tue Aug 23 19:32:20 2016 +0300 Revert native date picker commit Original commit message: "Use HTML5 date input fields instead of text fields with jquery ui date pickers (#19468)." This reverts commit c418fab8a76b7672c4f341fb7c3e203ae92b50c0. diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c727d0b..74c3f35 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1172,7 +1172,7 @@ module ApplicationHelper def calendar_for(field_id) include_calendar_headers_tags - javascript_tag("$(function() { $('##{field_id}').addClass('date').datepickerFallback(datepickerOptions); });") + javascript_tag("$(function() { $('##{field_id}').addClass('date').datepicker(datepickerOptions); });") end def include_calendar_headers_tags diff --git a/app/views/custom_fields/formats/_date.html.erb b/app/views/custom_fields/formats/_date.html.erb index b52c063..df3ba07 100644 --- a/app/views/custom_fields/formats/_date.html.erb +++ b/app/views/custom_fields/formats/_date.html.erb @@ -1,3 +1,3 @@ -

<%= f.date_field(:default_value, :value => @custom_field.default_value, :size => 10) %>

+

<%= f.text_field(:default_value, :size => 10) %>

<%= calendar_for('custom_field_default_value') %>

<%= f.text_field :url_pattern, :size => 50, :label => :label_link_values_to %>

diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 960256e..63782d2 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -52,14 +52,14 @@ <% if @issue.safe_attribute? 'start_date' %>

- <%= f.date_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %> + <%= f.text_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %> <%= calendar_for('issue_start_date') %>

<% end %> <% if @issue.safe_attribute? 'due_date' %>

- <%= f.date_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %> + <%= f.text_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %> <%= calendar_for('issue_due_date') %>

<% end %> diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb index 37bdb6d..db77431 100644 --- a/app/views/issues/bulk_edit.html.erb +++ b/app/views/issues/bulk_edit.html.erb @@ -147,7 +147,7 @@ <% if @safe_attributes.include?('start_date') %>

- <%= date_field_tag 'issue[start_date]', '', :value => @issue_params[:start_date], :size => 10 %><%= calendar_for('issue_start_date') %> + <%= text_field_tag 'issue[start_date]', '', :value => @issue_params[:start_date], :size => 10 %><%= calendar_for('issue_start_date') %>

<% end %> @@ -155,7 +155,7 @@ <% if @safe_attributes.include?('due_date') %>

- <%= date_field_tag 'issue[due_date]', '', :value => @issue_params[:due_date], :size => 10 %><%= calendar_for('issue_due_date') %> + <%= text_field_tag 'issue[due_date]', '', :value => @issue_params[:due_date], :size => 10 %><%= calendar_for('issue_due_date') %>

<% end %> diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb index ebd9d39..ac6ba91 100644 --- a/app/views/timelog/_form.html.erb +++ b/app/views/timelog/_form.html.erb @@ -17,7 +17,7 @@ <%= "#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}" %> <% end %>

-

<%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>

+

<%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>

<%= f.text_field :hours, :size => 6, :required => true %>

<%= f.text_field :comments, :size => 100, :maxlength => 1024 %>

<%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>

diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb index 640f7d8..8f6c674 100644 --- a/app/views/timelog/bulk_edit.html.erb +++ b/app/views/timelog/bulk_edit.html.erb @@ -18,7 +18,7 @@

- <%= date_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %> + <%= text_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %>

diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb index 3d8ecd4..db84f07 100644 --- a/app/views/versions/_form.html.erb +++ b/app/views/versions/_form.html.erb @@ -6,7 +6,7 @@

<%= f.text_field :description, :size => 60 %>

<%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>

<%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %>

-

<%= f.date_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %>

+

<%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %>

<%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>

<% @version.custom_field_values.each do |value| %> diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index 0347ca8..1ee6e88 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -476,12 +476,12 @@ module Redmine end def edit_tag(view, tag_id, tag_name, custom_value, options={}) - view.date_field_tag(tag_name, custom_value.value, options.merge(:id => tag_id, :size => 10)) + + view.text_field_tag(tag_name, custom_value.value, options.merge(:id => tag_id, :size => 10)) + view.calendar_for(tag_id) end def bulk_edit_tag(view, tag_id, tag_name, custom_field, objects, value, options={}) - view.date_field_tag(tag_name, value, options.merge(:id => tag_id, :size => 10)) + + view.text_field_tag(tag_name, value, options.merge(:id => tag_id, :size => 10)) + view.calendar_for(tag_id) + bulk_clear_tag(view, tag_id, tag_name, custom_field, value) end diff --git a/public/javascripts/application.js b/public/javascripts/application.js index eedeae0..d292790 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -185,12 +185,12 @@ function buildFilterRow(field, operator, values) { case "date": case "date_past": tr.find('td.values').append( - '' + - ' ' + + '' + + ' ' + ' '+labelDayPlural+'' ); - $('#values_'+fieldId+'_1').val(values[0]).datepickerFallback(datepickerOptions); - $('#values_'+fieldId+'_2').val(values[1]).datepickerFallback(datepickerOptions); + $('#values_'+fieldId+'_1').val(values[0]).datepicker(datepickerOptions); + $('#values_'+fieldId+'_2').val(values[1]).datepicker(datepickerOptions); $('#values_'+fieldId).val(values[0]); break; case "string": @@ -587,7 +587,7 @@ function beforeShowDatePicker(input, inst) { } break; } - $(input).datepickerFallback("option", "defaultDate", default_date); + $(input).datepicker("option", "defaultDate", default_date); } (function($){ @@ -733,33 +733,6 @@ function toggleNewObjectDropdown() { dropdown.addClass('visible'); } } - -(function ( $ ) { - - // detect if native date input is supported - var nativeDateInputSupported = true; - - var input = document.createElement('input'); - input.setAttribute('type','date'); - if (input.type === 'text') { - nativeDateInputSupported = false; - } - - var notADateValue = 'not-a-date'; - input.setAttribute('value', notADateValue); - if (input.value === notADateValue) { - nativeDateInputSupported = false; - } - - $.fn.datepickerFallback = function( options ) { - if (nativeDateInputSupported) { - return this; - } else { - return this.datepicker( options ); - } - }; -}( jQuery )); - $(document).ready(function(){ $('#content').on('change', 'input[data-disables], input[data-enables], input[data-shows]', toggleDisabledOnChange); toggleDisabledInit();