Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Datetime: add rtl support (correct arrows & positioning), fixes #1842

Browse source
This commit is contained in:
Felix Niklas 2018-04-12 16:50:04 +02:00
parent d8faaebbc7
commit b585f46ac6
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/controllers/_ui_element/date.coffee
View file

@ -70,6 +70,7 @@ class App.UiElement.date
todayBtn: 'linked'
todayHighlight: true
format: App.i18n.timeFormat().date
rtl: App.i18n.dir() is 'rtl'
container: item
language: 'custom'
)

1
app/assets/javascripts/app/controllers/_ui_element/datetime.coffee
View file

@ -70,6 +70,7 @@ class App.UiElement.datetime
todayBtn: 'linked'
todayHighlight: true
format: App.i18n.timeFormat().date
rtl: App.i18n.dir() is 'rtl'
container: item
language: 'custom'
)

2
app/assets/javascripts/app/controllers/layout_ref.coffee
View file

@ -1516,6 +1516,7 @@ class InputsRef extends App.ControllerContent
todayHighlight: true
startDate: new Date()
format: App.i18n.timeFormat().date
rtl: App.i18n.dir() is 'rtl'
container: @$('.js-datepicker3').parent()
)
@ -1524,6 +1525,7 @@ class InputsRef extends App.ControllerContent
todayHighlight: true
startDate: new Date()
format: App.i18n.timeFormat().date
rtl: App.i18n.dir() is 'rtl'
container: @$('.js-datepicker4').parent()
)
@$('.js-timepicker4').timepicker()

7
app/assets/javascripts/app/lib/bootstrap/bootstrap-datepicker.js vendored
View file

@ -702,7 +702,8 @@
var height = this.component ? this.component.outerHeight(true) : this.element.outerHeight(false);
var width = this.component ? this.component.outerWidth(true) : this.element.outerWidth(false);
var left = offset.left - appendOffset.left,
top = offset.top - appendOffset.top;
top = offset.top - appendOffset.top,
right = container.width() - width - left;
this.picker.removeClass(
'datepicker-orient-top datepicker-orient-bottom '+
@ -713,6 +714,8 @@
this.picker.addClass('datepicker-orient-' + this.o.orientation.x);
if (this.o.orientation.x === 'right')
left -= calendarWidth - width;
if(this.o.rtl)
right -= calendarWidth - width;
}
// auto x orientation is best-placement: if it crosses a window
// edge, fudge it sideways
@ -725,6 +728,7 @@
// the calendar passes the widow right edge. Align it to component right side
this.picker.addClass('datepicker-orient-right');
left = offset.left + width - calendarWidth;
right = 0;
} else {
// Default to left
this.picker.addClass('datepicker-orient-left');
@ -747,7 +751,6 @@
top += height;
if (this.o.rtl) {
var right = windowWidth - (left + width);
this.picker.css({
top: top,
right: right,