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

updating dialog

Browse source
This commit is contained in:
Rolux 2010-02-20 09:28:46 +05:30
parent 6c2304022d
commit 96e06b2cb2
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/css/ox.ui.css
View file

@ -69,8 +69,8 @@ Dialog
//left: 0px; //left: 0px;
//right: 0px; //right: 0px;
//height: 16px; //height: 16px;
padding: 3px 8px 5px 8px; //padding: 3px 8px 5px 8px;
padding: 3px 0 5px 0; //padding: 3px 0 5px 0;
cursor: move; cursor: move;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
@ -81,7 +81,7 @@ Dialog
} }
.OxDialog > .OxTitleBar > .OxTitle { .OxDialog > .OxTitleBar > .OxTitle {
margin: 0 8px 0 8px; margin: 3px 8px 0 8px;
font-size: 13px; font-size: 13px;
font-weight: bold; font-weight: bold;
text-overflow: ellipsis; text-overflow: ellipsis;

16
build/js/ox.ui.js
View file

@ -26,11 +26,9 @@ requires
}, },
getBarSize: function(size) { getBarSize: function(size) {
var sizes = { var sizes = {
xsmall: 16, small: 20,
small: 24, medium: 24,
medium: 28, large: 28,
large: 32,
xlarge: 40
}; };
return sizes[size]; return sizes[size];
}, },
@ -240,8 +238,6 @@ requires
$eventHandler.unbind(event, callback); $eventHandler.unbind(event, callback);
}, },
unbindKeyboard: function(id) { unbindKeyboard: function(id) {
//Ox.print(keyboardEvents)
//Ox.print("unbindKeyboard", id, keyboardEvents[id])
$.each(keyboardEvents[id] || [], function(event, callback) { $.each(keyboardEvents[id] || [], function(event, callback) {
$eventHandler.unbind(event, callback); $eventHandler.unbind(event, callback);
}); });
@ -462,7 +458,6 @@ requires
$document.keydown(function(event) { $document.keydown(function(event) {
var $element = $("input:focus"); var $element = $("input:focus");
if ($element.length) { if ($element.length) {
console.log("@", $element[0].selectionStart, $element[0].selectionEnd)
if ( if (
( (
keyNames[event.keyCode] == "up" && keyNames[event.keyCode] == "up" &&
@ -484,7 +479,7 @@ requires
function keypress(event) { function keypress(event) {
var key, var key,
keys = [], keys = [],
ret = true, //ret = true,
time; time;
$.each(modifierNames, function(k, v) { $.each(modifierNames, function(k, v) {
if (event[k]) { if (event[k]) {
@ -1178,6 +1173,8 @@ requires
.options(options || {}) .options(options || {})
.addClass("OxBar Ox" + Ox.toTitleCase(self.options.orientation)), .addClass("OxBar Ox" + Ox.toTitleCase(self.options.orientation)),
dimensions = oxui.getDimensions(self.options.orientation); dimensions = oxui.getDimensions(self.options.orientation);
self.options.size = Ox.isString(self.options.size) ?
oxui.getBarSize(self.options.size) : self.options.size;
that.css(dimensions[0], "100%") that.css(dimensions[0], "100%")
.css(dimensions[1], self.options.size + "px"); .css(dimensions[1], self.options.size + "px");
return that; return that;
@ -1215,6 +1212,7 @@ requires
}; };
// fixme: no need for this
Ox.Toolbar = function(options, self) { Ox.Toolbar = function(options, self) {
var self = self || {}, var self = self || {},
that = new Ox.Bar({ that = new Ox.Bar({

4
demos/test/index.html
View file

@ -166,7 +166,7 @@
], ],
size: "large" size: "large"
}); });
var bottomPanel = Ox.Toolbar({size: "small"}) var bottomPanel = Ox.Bar({size: "small"})
.css({ .css({
zIndex: 2, zIndex: 2,
MozBoxShadow: "0 0 4px rgb(0, 0, 0)", MozBoxShadow: "0 0 4px rgb(0, 0, 0)",
@ -217,7 +217,7 @@
}).appendTo(mainPanel); }).appendTo(mainPanel);
for (var i = 0; i < 5; i++) { for (var i = 0; i < 5; i++) {
$toolbars[i] = Ox.Toolbar({size: i ? "small" : "medium"}).appendTo(mainPanel); $toolbars[i] = Ox.Bar({size: i ? "medium" : "large"}).appendTo(mainPanel);
} }
$toolbars[5] = Ox.Bar({size: 24}).appendTo(mainPanel); $toolbars[5] = Ox.Bar({size: 24}).appendTo(mainPanel);