0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

fix some scrollbar scale bugs

Browse source
This commit is contained in:
rolux 2011-05-26 20:49:48 +02:00
parent 385aac008c
commit 457e175455
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
demos/calendar/js/calendar.js
View file

@ -120,6 +120,7 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'Andy Warhol', start: '1928-08-06', end: '1987-02-22', type: 'person'}, {name: 'Andy Warhol', start: '1928-08-06', end: '1987-02-22', type: 'person'},
{name: 'Félix Guattari', start: '1930-04-30', end: '1992-08-29', type: 'person'}, {name: 'Félix Guattari', start: '1930-04-30', end: '1992-08-29', type: 'person'},
{name: 'Guy Debord', start: '1931-12-28', end: '1994-11-30', type: 'person'}, {name: 'Guy Debord', start: '1931-12-28', end: '1994-11-30', type: 'person'},
{name: 'Saddam Hussein', start: '1937-04-28', end: '2006-12-30', type: 'person'},
{name: 'John Lennon', start: '1940-10-09', end: '1980-12-08', type: 'person'}, {name: 'John Lennon', start: '1940-10-09', end: '1980-12-08', type: 'person'},
{name: 'Jimi Hendrix', start: '1942-11-27', end: '1970-09-18', type: 'person'}, {name: 'Jimi Hendrix', start: '1942-11-27', end: '1970-09-18', type: 'person'},
{name: 'Edie Sedgwick', start: '1943-04-20', end: '1971-11-16', type: 'person'}, {name: 'Edie Sedgwick', start: '1943-04-20', end: '1971-11-16', type: 'person'},

7
source/Ox.UI/js/Calendar/Ox.Calendar.js
View file

@ -178,14 +178,11 @@ Ox.Calendar = function(options, self) {
id: 'month', id: 'month',
seconds: 365.2425 / 12 * 86400, seconds: 365.2425 / 12 * 86400,
date: function(i) { date: function(i) {
///*
var date = new Date(); var date = new Date();
date.setUTCFullYear(Math.floor(i / 12) + 1970); date.setUTCFullYear(Math.floor(i / 12) + 1970);
date.setUTCMonth(Ox.mod(i, 12)); date.setUTCMonth(Ox.mod(i, 12));
date.setUTCDate(0); // fixme: WTF?? date.setUTCDate(0); // fixme: WTF??
return date; return date;
//*/
//return new Date(Date.UTC(Math.floor(i / 12) + 1970, Ox.mod(i, 12), 1));
}, },
name: function(i) { name: function(i) {
return Ox.SHORT_MONTHS[Ox.mod(i, 12)] + ' ' + Math.floor(i / 12 + 1970) return Ox.SHORT_MONTHS[Ox.mod(i, 12)] + ' ' + Math.floor(i / 12 + 1970)
@ -451,7 +448,7 @@ Ox.Calendar = function(options, self) {
marginLeft: (e.clientX - self.drag.x) + 'px' marginLeft: (e.clientX - self.drag.x) + 'px'
}); });
self.$scrollbar.css({ self.$scrollbar.css({
marginLeft: Math.round((e.clientX - self.drag.x) / 16) + 'px' marginLeft: Math.round((e.clientX - self.drag.x) / getScrollbarFactor()) + 'px'
}); });
//*/ //*/
/* /*
@ -515,7 +512,7 @@ Ox.Calendar = function(options, self) {
function dragafterScrollbar(e) { function dragafterScrollbar(e) {
self.options.date = new Date( self.options.date = new Date(
+self.options.date + (self.drag.x - e.clientX) * getSecondsPerPixel() * 1000 * 16 +self.options.date + (self.drag.x - e.clientX) * getSecondsPerPixel() * 1000 * getScrollbarFactor()
); );
// fixme: duplicated // fixme: duplicated
self.$content.css({ self.$content.css({

2
source/Ox.js
View file

@ -1136,6 +1136,8 @@ Ox.PATH = Array.prototype.slice.apply(
})[0].src.replace('Ox.js', ''); })[0].src.replace('Ox.js', '');
//@ Ox.PREFIXES <[str]> <code>['K', 'M', 'G', 'T', 'P']</code> //@ Ox.PREFIXES <[str]> <code>['K', 'M', 'G', 'T', 'P']</code>
Ox.PREFIXES = ['K', 'M', 'G', 'T', 'P']; Ox.PREFIXES = ['K', 'M', 'G', 'T', 'P'];
//@ Ox.SEASONS <[str]> Names of the seasons of the year
Ox.SEASONS = ['Winter', 'Spring', 'Summer', 'Fall'];
//@ Ox.SYMBOLS <obj> Unicode characters for symbols //@ Ox.SYMBOLS <obj> Unicode characters for symbols
Ox.SYMBOLS = { Ox.SYMBOLS = {
DOLLAR: '\u0024', DOLLAR: '\u0024',