jro_apps/redmine Commit - r14993:c418fab8a76b

Use HTML5 date input fields instead of text fields with jquery ui date pickers (#19468)....

Jean-Philippe Lang -

r14993:c418fab8a76b

parent child

Context file:

r14993:c418fab8a76b

Collapse all files

app/helpers/application_helper.rb +1 -1

               def calendar_for(field_id)
                 include_calendar_headers_tags
-                javascript_tag("$(function() { $('##{field_id}').addClass('date').datepicker(datepickerOptions); });")
+                javascript_tag("$(function() { $('##{field_id}').addClass('date').datepickerFallback(datepickerOptions); });")
               end
               def include_calendar_headers_tags

app/views/custom_fields/formats/_date.html.erb +1 -1

-            <p><%= f.text_field(:default_value, :size => 10) %></p>
+            <p><%= f.date_field(:default_value, :value => @custom_field.default_value, :size => 10) %></p>
             <%= calendar_for('custom_field_default_value') %>
             <p><%= f.text_field :url_pattern, :size => 50, :label => :label_link_values_to %></p>

app/views/issues/_attributes.html.erb +2 -2

             <% if @issue.safe_attribute? 'start_date' %>
             <p id="start_date_area">
-              <%= f.text_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
+              <%= f.date_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
               <%= calendar_for('issue_start_date') %>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'due_date' %>
             <p id="due_date_area">
-              <%= f.text_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %>
+              <%= f.date_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %>
               <%= calendar_for('issue_due_date') %>
             </p>
             <% end %>

app/views/issues/bulk_edit.html.erb +2 -2

             <% if @safe_attributes.include?('start_date') %>
             <p>
               <label for='issue_start_date'><%= l(:field_start_date) %></label>
-              <%= text_field_tag 'issue[start_date]', '', :value => @issue_params[:start_date], :size => 10 %><%= calendar_for('issue_start_date') %>
+              <%= date_field_tag 'issue[start_date]', '', :value => @issue_params[:start_date], :size => 10 %><%= calendar_for('issue_start_date') %>
               <label class="inline"><%= check_box_tag 'issue[start_date]', 'none', (@issue_params[:start_date] == 'none'), :id => nil, :data => {:disables => '#issue_start_date'} %><%= l(:button_clear) %></label>
             </p>
             <% end %>
             <% if @safe_attributes.include?('due_date') %>
             <p>
               <label for='issue_due_date'><%= l(:field_due_date) %></label>
-              <%= text_field_tag 'issue[due_date]', '', :value => @issue_params[:due_date], :size => 10 %><%= calendar_for('issue_due_date') %>
+              <%= date_field_tag 'issue[due_date]', '', :value => @issue_params[:due_date], :size => 10 %><%= calendar_for('issue_due_date') %>
               <label class="inline"><%= check_box_tag 'issue[due_date]', 'none', (@issue_params[:due_date] == 'none'), :id => nil, :data => {:disables => '#issue_due_date'} %><%= l(:button_clear) %></label>
             </p>
             <% end %>

app/views/timelog/_form.html.erb +1 -1

                   <span id="time_entry_issue"><%= "#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}" %></span>
                 <% end %>
               </p>
-              <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
+              <p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
               <p><%= f.text_field :hours, :size => 6, :required => true %></p>
               <p><%= f.text_field :comments, :size => 100, :maxlength => 1024 %></p>
               <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>

app/views/timelog/bulk_edit.html.erb +1 -1

                 <p>
                   <label><%= l(:field_spent_on) %></label>
-                  <%= text_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %>
+                  <%= date_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %>
                 </p>
                 <p>

app/views/versions/_form.html.erb +1 -1

             <p><%= f.text_field :description, :size => 60 %></p>
             <p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
             <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
-            <p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
+            <p><%= f.date_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
             <p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
             <% @version.custom_field_values.each do |value| %>

lib/redmine/field_format.rb +2 -2

                   end
                   def edit_tag(view, tag_id, tag_name, custom_value, options={})
-                    view.text_field_tag(tag_name, custom_value.value, options.merge(:id => tag_id, :size => 10)) +
+                    view.date_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.text_field_tag(tag_name, value, options.merge(:id => tag_id, :size => 10)) +
+                    view.date_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

public/javascripts/application.js +32 -5

@@ -185,12 +185,12 function buildFilterRow(field, operator, values) {
185	case "date":	185	case "date":
186	case "date_past":	186	case "date_past":
187	tr.find('td.values').append(	187	tr.find('td.values').append(
188	'<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="10" class="value date_value" /></span>' +	188	'<span style="display:none;"><input type="date" name="v['+field+'][]" id="values_'+fieldId+'_1" size="10" class="value date_value" /></span>' +
189	' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="10" class="value date_value" /></span>' +	189	' <span style="display:none;"><input type="date" name="v['+field+'][]" id="values_'+fieldId+'_2" size="10" class="value date_value" /></span>' +
190	' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="3" class="value" /> '+labelDayPlural+'</span>'	190	' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="3" class="value" /> '+labelDayPlural+'</span>'
191	);	191	);
192	$('#values_'+fieldId+'_1').val(values[0]).datepicker(datepickerOptions);	192	$('#values_'+fieldId+'_1').val(values[0]).datepickerFallback(datepickerOptions);
193	$('#values_'+fieldId+'_2').val(values[1]).datepicker(datepickerOptions);	193	$('#values_'+fieldId+'_2').val(values[1]).datepickerFallback(datepickerOptions);
194	$('#values_'+fieldId).val(values[0]);	194	$('#values_'+fieldId).val(values[0]);
195	break;	195	break;
196	case "string":	196	case "string":
@@ -587,7 +587,7 function beforeShowDatePicker(input, inst) {
587	}	587	}
588	break;	588	break;
589	}	589	}
590	$(input).datepicker("option", "defaultDate", default_date);	590	$(input).datepickerFallback("option", "defaultDate", default_date);
591	}	591	}
592		592
593	(function($){	593	(function($){
@@ -723,6 +723,33 function toggleDisabledOnChange() {
723	function toggleDisabledInit() {	723	function toggleDisabledInit() {
724	$('input[data-disables], input[data-enables]').each(toggleDisabledOnChange);	724	$('input[data-disables], input[data-enables]').each(toggleDisabledOnChange);
725	}	725	}
		726
		727	(function ( $ ) {
		728
		729	// detect if native date input is supported
		730	var nativeDateInputSupported = true;
		731
		732	var input = document.createElement('input');
		733	input.setAttribute('type','date');
		734	if (input.type === 'text') {
		735	nativeDateInputSupported = false;
		736	}
		737
		738	var notADateValue = 'not-a-date';
		739	input.setAttribute('value', notADateValue);
		740	if (input.value === notADateValue) {
		741	nativeDateInputSupported = false;
		742	}
		743
		744	$.fn.datepickerFallback = function( options ) {
		745	if (nativeDateInputSupported) {
		746	return this;
		747	} else {
		748	return this.datepicker( options );
		749	}
		750	};
		751	}( jQuery ));
		752
726	$(document).ready(function(){	753	$(document).ready(function(){
727	$('#content').on('change', 'input[data-disables], input[data-enables]', toggleDisabledOnChange);	754	$('#content').on('change', 'input[data-disables], input[data-enables]', toggleDisabledOnChange);
728	toggleDisabledInit();	755	toggleDisabledInit();

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages