sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

make (almost all of) form demo work again

Browse source
This commit is contained in:
rolux 2011-05-12 06:15:01 +02:00
commit c5408a6656
11 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/Ox.UI/css/Ox.UI.css
View file

@ -488,12 +488,12 @@ OxButtonGroup
-webkit-border-bottom-right-radius: 2px;
}
.OxButtonGroup > .OxButton.OxTab {
-moz-border-radius-topleft: 4px;
-moz-border-radius-topright: 4px;
-moz-border-radius-topleft: 8px;
-moz-border-radius-topright: 8px;
-moz-border-radius-bottomleft: 0;
-moz-border-radius-bottomright: 0;
-webkit-border-top-left-radius: 4px;
-webkit-border-top-right-radius: 4px;
-webkit-border-top-left-radius: 8px;
-webkit-border-top-right-radius: 8px;
-webkit-border-bottom-left-radius: 0;
-webkit-border-bottom-right-radius: 0;
}

6
source/Ox.UI/js/Core/Ox.Keyboard.js
View file

@ -60,10 +60,12 @@
key = keyNames.join('_');
if (focused !== null) {
Ox.UI.elements[focused].triggerEvent('key_' + key);
// prevent Chrome from going back in history, or scrolling
// prevent Chrome fromor scrolling
// fixme: backspace -> history.back, blocking it doesn't work
// when the autocomplete menu of an input element has focus
if (
[
'backspace', 'down', 'left', 'right', 'space', 'up'
'down', 'left', 'right', 'space', 'up'
].indexOf(keyBasename) > -1 &&
!Ox.UI.elements[focused].hasClass('OxInput')
) {

4
source/Ox.UI/js/Form/Ox.Input.js
View file

@ -363,8 +363,8 @@ Ox.Input = function(options, self) {
offset: {
left: 4,
top: 0
},
size: self.options.size
}
//size: self.options.size
})
.bindEvent('click', clickMenu);
if (self.options.autocompleteReplace) {

4
source/Ox.UI/js/Form/Ox.PlacePicker.js
View file

@ -122,10 +122,12 @@ Ox.PlacePicker = function(options, self) {
function showPicker() {
if (!self.map) {
self.$map = new Ox.Map({
clickable: true,
id: self.options.id + 'Map',
places: [self.options.value]
//places: [self.options.value]
})
.css({
top: '16px',
width: '256px',
height: '160px'
})

4
source/Ox.UI/js/Map/Ox.Map.js
View file

@ -944,10 +944,10 @@ Ox.Map = function(options, self) {
function updateFormElements() {
var width = that.width();
self.$zoomInput && constructZoomInput();
self.$placeNameInput.options({
self.$placeNameInput && self.$placeNameInput.options({
width: Math.floor((width - 112) / 2)
});
self.$placeGeonameInput.options({
self.$placeGeonameInput && self.$placeGeonameInput.options({
width: Math.ceil((width - 112) / 2)
});
}

4
source/Ox.UI/js/Menu/Ox.Menu.js
View file

@ -20,7 +20,7 @@
select_menuId {id, value} item was selected
*/
Ox.Menu = function(options, self) {
Ox.print(options)
var self = self || {},
that = new Ox.Element({}, self)
.defaults({
@ -35,7 +35,7 @@ Ox.Menu = function(options, self) {
parent: null,
selected: -1,
side: 'bottom',
size: 'medium',
size: 'medium' // fixme: remove
})
.options(options || {})
.addClass(

7
source/Ox.UI/themes/classic/css/classic.css
View file

@ -133,7 +133,14 @@ Forms
//background: -webkit-gradient(linear, left top, left bottom, from(rgb(128, 128, 128)), color-stop(0.1, rgb(160, 160, 160)), to(rgb(192, 192, 192)));
color: rgb(32, 32, 32);
}
.OxThemeClassic .OxButton.OxTab {
//background: -moz-linear-gradient(top, rgb(160, 160, 160), rgb(192, 192, 192));
//background: -webkit-linear-gradient(top, rgb(160, 160, 160), rgb(192, 192, 192));
}
.OxThemeClassic .OxButton.OxTab.OxSelected {
//background: -moz-linear-gradient(top, rgb(224, 224, 224), rgb(192, 192, 192));
//background: -webkit-linear-gradient(top, rgb(224, 224, 224), rgb(192, 192, 192));
border-bottom: 1px solid rgb(192, 192, 192);
}