Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new datepicker. #432

Merged
merged 6 commits into from
Sep 19, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
//
//= require jquery
//= require jquery.ui.all
//= require jquery-ui-i18n
//= require jquery.menu_expand
//= require jquery_ujs
//= require jquery_noconflict
Expand All @@ -56,7 +57,6 @@
//= require findDomElement
//= require context_menu
//= require jstoolbar
//= require calendar
//= require ajaxappender
//= require issues
//= require work_packages
Expand All @@ -69,6 +69,46 @@ if (typeof []._reverse == 'undefined') {
jQuery.fn.reverse = Array.prototype._reverse;
}

jQuery(document).ready(function ($) {
if (typeof CS !== "undefined") {
var regions = $.datepicker.regional;
var regional = regions[CS.lang] || regions[""];
$.datepicker.setDefaults(regional);

var gotoToday = $.datepicker._gotoToday;

$.datepicker._gotoToday = function (id) {
gotoToday.call(this, id);
var target = $(id),
inst = this._getInst(target[0]),
dateStr = $.datepicker._formatDate(inst);
target.val(dateStr);
target.blur();
$.datepicker._hideDatepicker();
};

var defaults = {
showWeek: true,
changeMonth: true,
changeYear: true,
dateFormat: 'yy-mm-dd',
showButtonPanel: true,
calculateWeek: function (d) {
if (d.getDay() !== 1) {
d.setDate(d.getDate() - d.getDay() + 1);
}
return $.datepicker.iso8601Week(d);
}
};

if (CS.firstWeekDay && CS.firstWeekDay !== "") {
defaults.firstDay = parseInt(CS.firstWeekDay, 10);
}

$.datepicker.setDefaults(defaults);
}
});

jQuery(document).ajaxError(function(event, request, settings) {
if (request.status === 401 && /X-Reason: login needed/.match(request.getAllResponseHeaders())) {
if (confirm(I18n.t("js.logoff") + "\r\n" + I18n.t("js.redirect_login"))) {
Expand Down
30 changes: 0 additions & 30 deletions app/assets/javascripts/calendar.js

This file was deleted.

200 changes: 0 additions & 200 deletions app/assets/javascripts/calendar/calendar-setup.js

This file was deleted.

Loading