diff --git a/build/css/ox.ui.classic.css b/build/css/ox.ui.classic.css
index 6b9f123c..c510c5e4 100644
--- a/build/css/ox.ui.classic.css
+++ b/build/css/ox.ui.classic.css
@@ -166,8 +166,8 @@ Lists
*/
.OxThemeClassic .OxIconList .OxItem > .OxReflection > div {
- background: -moz-linear-gradient(top, rgba(240, 240, 240, 0.5), rgba(240, 240, 240, 1));
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(240, 240, 240, 0.5)), color-stop(1, rgba(240, 240, 240, 1)));
+ background: -moz-linear-gradient(top, rgba(240, 240, 240, 0.75), rgba(240, 240, 240, 1));
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(240, 240, 240, 0.75)), color-stop(1, rgba(240, 240, 240, 1)));
}
.OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon img {
border-color: rgb(128, 128, 128);
diff --git a/build/css/ox.ui.css b/build/css/ox.ui.css
index 6914e8ca..9b4a580c 100644
--- a/build/css/ox.ui.css
+++ b/build/css/ox.ui.css
@@ -664,12 +664,16 @@ Lists
================================================================================
*/
-.OxListPage {
- position: absolute;
+.OxIconList.OxBoth {
+ overflow-x: hidden;
}
.OxIconList .OxPage {
- padding: 4px;
+ position: absolute;
+ left: 0;
+ right: 0;
+ margin-left: auto;
+ margin-right: auto;
}
.OxIconList .OxItem {
@@ -686,6 +690,11 @@ Lists
position: relative;
}
+.OxIconList .OxItem > .OxIcon,
+.OxIconList .OxItem > .OxText {
+ left: -2px;
+}
+
.OxIconList .OxItem > .OxIcon img {
position: absolute;
left: 0;
@@ -693,6 +702,7 @@ Lists
bottom: 0;
margin: auto;
border: 2px solid rgba(0, 0, 0, 0);
+ cursor: pointer;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
@@ -714,8 +724,8 @@ Lists
top: 0;
right: 0;
margin: auto;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
+ //-moz-border-radius: 4px;
+ //-webkit-border-radius: 4px;
-moz-transform: scaleY(-1);
-webkit-transform: scaleY(-1);
}
@@ -730,7 +740,7 @@ Lists
text-align: center;
padding: 1px 2px;
border: 2px solid rgba(0, 0, 0, 0);
- max-width: 120px;
+ max-width: 124px;
word-wrap: break-word;
cursor: pointer;
-moz-border-radius: 4px;
diff --git a/build/css/ox.ui.modern.css b/build/css/ox.ui.modern.css
index e9b4fb0c..e17020da 100644
--- a/build/css/ox.ui.modern.css
+++ b/build/css/ox.ui.modern.css
@@ -146,9 +146,19 @@ Lists
================================================================================
*/
+.OxThemeModern .OxIconList .OxItem {
+ //background: rgb(20, 20, 20);
+}
+.OxThemeModern .OxIconList .OxItem img.OxLoading {
+ background: -moz-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0));
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgb(32, 32, 32)), color-stop(1, rgb(0, 0, 0)));
+}
+.OxThemeModern .OxIconList .OxItem > .OxIcon img.OxLoading {
+ border-color: rgb(16, 16, 16);
+}
.OxThemeModern .OxIconList .OxItem > .OxReflection > div {
background: -moz-linear-gradient(top, rgba(16, 16, 16, 0.75), rgba(16, 16, 16, 1));
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(16, 16, 16, 0.5)), color-stop(1, rgba(16, 16, 16, 1)));
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(16, 16, 16, 0.75)), color-stop(1, rgba(16, 16, 16, 1)));
}
.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon img {
border-color: rgb(128, 128, 128);
diff --git a/build/js/ox.load.js b/build/js/ox.load.js
index 33c79345..3a2bad61 100644
--- a/build/js/ox.load.js
+++ b/build/js/ox.load.js
@@ -61,6 +61,9 @@ $(function() {
width: '32px',
height: '32px'
}))
+ .mousedown(function(e) {
+ e.preventDefault();
+ })
.appendTo($div),
deg = 0,
interval = setInterval(function() {
@@ -125,6 +128,9 @@ $(function() {
border: 0,
cursor: 'pointer'
}))
+ .mousedown(function(e) {
+ e.preventDefault();
+ })
.mouseenter(function() {
$(this).animate({
width: '72px',
diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js
index fec5a01b..7edac0cb 100644
--- a/build/js/ox.ui.js
+++ b/build/js/ox.ui.js
@@ -228,7 +228,7 @@ requires
callback({
config: config,
user: user
- });
+ });
});
});
});
@@ -242,7 +242,7 @@ requires
};
that.options = function() {
- return Ox.getset(self.options, Array.prototype.slice.call(arguments), self.change, that);
+ return Ox.getset(self.options, Array.prototype.slice.call(arguments), self.change, that);
};
that.request = function(action, data, callback) {
@@ -585,9 +585,9 @@ requires
keypress(event);
}
}
- });
+ });
} else {
- $document.keydown(keypress);
+ $document.keydown(keypress);
}
});
function keypress(event) {
@@ -612,7 +612,7 @@ requires
buffer = '';
}
buffer += key == 'SPACE' ? ' ' : key;
- bufferTime = time;
+ bufferTime = time;
}
Ox.Event.trigger('', 'key_' + key);
//return false;
@@ -622,9 +622,9 @@ requires
ret = Ox.event.trigger(keyboard + Ox.toCamelCase(key) + '.' + v);
return ret;
});
- */
+ */
}
-
+
})();
/*
@@ -756,7 +756,7 @@ requires
title: 'Details',
click: function() {
$dialog.close(function() {
- debug(request);
+ debug(request);
});
}
},
@@ -1077,7 +1077,7 @@ requires
}
*/
});
- ret = that;
+ ret = that;
}
return ret;
};
@@ -1677,7 +1677,7 @@ requires
elementWidth = that.width(),
offset = that.offset(),
x = event.clientX,
- y = event.clientY;
+ y = event.clientY;
$window.mousemove(function(event) {
that.css({
margin: 0
@@ -1699,7 +1699,7 @@ requires
});
$window.one('mouseup', function() {
$window.unbind('mousemove');
- });
+ });
}
function getButtonById(id) {
@@ -1762,7 +1762,7 @@ requires
});
$window.one('mouseup', function() {
$window.unbind('mousemove');
- });
+ });
}
self.onChange = function(key, value) {
@@ -2084,7 +2084,7 @@ requires
function mouseenter(event) {
self.$tooltip.show(event.clientX, event.clientY);
- }
+ }
function mouseleave(event) {
self.$tooltip.hide();
@@ -4014,7 +4014,7 @@ requires
function getVal(px) {
var px = self.trackSize / self.values >= 16 ? px : px - 8,
valPerPx = (self.options.max - self.options.min) /
- (self.trackSize - self.thumbSize);
+ (self.trackSize - self.thumbSize);
return Ox.limit(self.options.min +
Math.floor(px * valPerPx / self.options.step) * self.options.step,
self.options.min, self.options.max);
@@ -4641,7 +4641,7 @@ requires
serialize function
size 'large', 'medium' or 'small'
type 'password', 'select' or 'text'
- unit string, or
+ unit string, or
array [{ id, title, checked }] (selectable unit)
unitWidth integer (px)
value string, or
@@ -4977,7 +4977,7 @@ requires
function changeKey(event, data) {
Ox.print('changeKey', data);
if (data) { // fixme: necessary?
- self.key = {
+ self.key = {
id: data.id,
title: data.value // fixme: should be data.title
};
@@ -5102,7 +5102,7 @@ requires
size: 'medium',
type: 'text',
value: '',
- width: 128
+ width: 128
})
.options(options || {})
.addClass('OxInput Ox' + Ox.toTitleCase(self.options.size) + (
@@ -5538,7 +5538,7 @@ requires
function getVal(px) {
var px = trackWidth / values >= 16 ? px : px - 8,
valPerPx = (self.options.max - self.options.min) /
- (trackWidth - thumbWidth);
+ (trackWidth - thumbWidth);
return Ox.limit(self.options.min +
Math.floor(px * valPerPx / self.options.step) * self.options.step,
self.options.min, self.options.max);
@@ -5638,11 +5638,11 @@ requires
orientation: self.options.orientation,
keys: self.options.keys,
request: self.options.request,
- rowLength: 4,
+ // rowLength: 4,
size: 128,
- type: 'icon',
+ type: 'icon',
}/*, self*/)
- .addClass('OxIconList')
+ .addClass('OxIconList Ox' + Ox.toTitleCase(self.options.orientation))
.click(click)
.dblclick(dblclick)
.scroll(scroll);
@@ -5652,7 +5652,7 @@ requires
}
function constructItem(data) {
- var data = self.options.item(data, self.options.sort);
+ var data = self.options.item(data, self.options.sort, self.options.size);
return new Ox.IconItem($.extend(data, {
size: self.options.size
}));
@@ -5674,7 +5674,7 @@ requires
Ox.IconItem = function(options, self) {
- var self = self || {}
+ var self = self || {},
that = new Ox.Element({}, self)
.defaults({
height: 0,
@@ -5687,12 +5687,10 @@ requires
})
.options(options || {})
- Ox.print('IconItem', options);
-
$.extend(self, {
- height: self.options.size * 1.5,
+ height: self.options.size * 1.5,
url: oxui.path + '/png/ox.ui.' + Ox.theme() + '/icon.png',
- width: self.options.size + 4
+ width: self.options.size
});
that.css({
@@ -5703,10 +5701,11 @@ requires
.addClass('OxIcon')
.css({
top: self.options.size == 64 ? -70 : -120,
- width: self.options.size + 'px',
+ width: (self.options.size + 4) + 'px',
height: self.options.size + 'px'
});
that.$iconImage = $('')
+ .addClass('OxLoading OxTarget')
.attr({
src: self.options.url
})
@@ -5714,30 +5713,25 @@ requires
width: self.options.width + 'px',
height: self.options.height + 'px'
})
+ .mousedown(mousedown)
.mouseenter(mouseenter)
.mouseleave(mouseleave)
- /*
- .load(function() {
- that.$iconImage.attr({
- src: self.options.url
- })
- Ox.print('width:', that.$iconImage[0].width);
- });
- */
+ .load(load);
that.$textBox = $('