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

improvements for list item preview

Browse source
This commit is contained in:
rolux 2010-09-13 13:53:31 +02:00
parent 1d00e6dc2e
commit 314ddf7d75
1 changed files with 78 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1582,7 +1582,9 @@ requires
height: 216, height: 216,
minHeight: 144, minHeight: 144,
minWidth: 256, minWidth: 256,
movable: true,
padding: 16, padding: 16,
resizable: true,
width: 384 width: 384
}) })
.options(options || {}) .options(options || {})
@ -1593,6 +1595,11 @@ requires
} }
}); });
$.extend(self, {
initialWidth: self.options.width,
initialHeight: self.options.height
})
if (!Ox.isArray(self.options.buttons[0])) { if (!Ox.isArray(self.options.buttons[0])) {
self.options.buttons = [[], self.options.buttons]; self.options.buttons = [[], self.options.buttons];
} }
@ -1601,9 +1608,10 @@ requires
size: 'medium' size: 'medium'
}) })
.addClass('OxTitleBar') .addClass('OxTitleBar')
.mousedown(drag)
.dblclick(center)
.appendTo(that); .appendTo(that);
self.options.movable && that.$titlebar
.mousedown(drag)
.dblclick(center);
that.$title = new Ox.Element() that.$title = new Ox.Element()
.addClass('OxTitle') .addClass('OxTitle')
@ -1635,11 +1643,13 @@ requires
.appendTo(that.$buttonsbar); .appendTo(that.$buttonsbar);
}); });
that.$resize = new Ox.Element() if (self.options.resizable) {
.addClass('OxResize') that.$resize = new Ox.Element()
.mousedown(resize) .addClass('OxResize')
.dblclick(reset) .mousedown(resize)
.appendTo(that.$buttonsbar); .dblclick(reset)
.appendTo(that.$buttonsbar);
}
$.each(self.options.buttons[1].reverse(), function(i, button) { $.each(self.options.buttons[1].reverse(), function(i, button) {
that.$buttons[that.$buttons.length] = new Ox.Button({ that.$buttons[that.$buttons.length] = new Ox.Button({
@ -1726,12 +1736,17 @@ requires
} }
function reset() { function reset() {
$.extend(self.options, {
height: self.initialHeight,
width: self.initialWidth
});
that/*.css({ that/*.css({
left: Math.max(that.offset().left, 24 - that.width()) left: Math.max(that.offset().left, 24 - that.width())
})*/ })*/
.width(self.options.width) .width(self.options.width)
.height(self.options.height); .height(self.options.height);
that.$content.height(self.options.height - 48 - 2 * self.options.padding); // fixme: this should happen automatically that.$content.height(self.options.height - 48 - 2 * self.options.padding); // fixme: this should happen automatically
triggerResizeEvent();
} }
function resize(event) { function resize(event) {
@ -1748,37 +1763,45 @@ requires
top: offset.top, top: offset.top,
margin: 0 margin: 0
}); });
var width = Ox.limit( self.options.width = Ox.limit(
elementWidth - x + event.clientX, elementWidth - x + event.clientX,
self.options.minWidth, Math.min(documentWidth, documentWidth - offset.left) self.options.minWidth, Math.min(documentWidth, documentWidth - offset.left)
), );
height = Ox.limit( self.options.height = Ox.limit(
elementHeight - y + event.clientY, elementHeight - y + event.clientY,
self.options.minHeight, documentHeight - offset.top self.options.minHeight, documentHeight - offset.top
); );
that.width(width); that.width(self.options.width);
that.height(height); that.height(self.options.height);
that.$content.height(height - 48 - 2 * self.options.padding); // fixme: this should happen automatically that.$content.height(self.options.height - 48 - 2 * self.options.padding); // fixme: this should happen automatically
triggerResizeEvent();
}); });
$window.one('mouseup', function() { $window.one('mouseup', function() {
$window.unbind('mousemove'); $window.unbind('mousemove');
}); });
} }
function triggerResizeEvent() {
that.triggerEvent('resize', {
width: self.options.width,
height: self.options.height
});
}
self.onChange = function(key, value) { self.onChange = function(key, value) {
if (key == 'height' || key == 'width') { if (key == 'height' || key == 'width') {
that.animate({ that.animate({
height: self.options.height + 'px', height: self.options.height + 'px',
width: self.options.width + 'px' width: self.options.width + 'px'
}, 250); }, 100);
that.$content.height(self.options.height - 48 - 2 * self.options.padding); // fixme: this should happen automatically that.$content.height(self.options.height - 48 - 2 * self.options.padding); // fixme: this should happen automatically
} else if (key == 'title') { } else if (key == 'title') {
that.$title.animate({ that.$title.animate({
opacity: 0 opacity: 0
}, 250, function() { }, 100, function() {
that.$title.html(value).animate({ that.$title.html(value).animate({
opacity: 1 opacity: 1
}, 250); }, 100);
}); });
} }
} }
@ -1786,7 +1809,11 @@ requires
that.append = function($element) { that.append = function($element) {
that.$content.append($element); that.$content.append($element);
return that; return that;
} };
that.center = function() {
};
that.close = function(callback) { that.close = function(callback) {
callback = callback || function() {}; callback = callback || function() {};
@ -1799,7 +1826,7 @@ requires
}); });
$window.unbind('mouseup', mouseupLayer) $window.unbind('mouseup', mouseupLayer)
return that; return that;
} };
that.disable = function() { that.disable = function() {
// to be used on submit of form, like login // to be used on submit of form, like login
@ -1841,6 +1868,25 @@ requires
return that; return that;
}; };
that.resize = function(width, height, callback) {
$.extend(self, {
initialWidth: width,
initialHeight: height
});
$.extend(self.options, {
width: width,
height: height
});
// fixme: duplicated
that.animate({
height: self.options.height + 'px',
width: self.options.width + 'px'
}, 100, function() {
that.$content.height(self.options.height - 48 - 2 * self.options.padding); // fixme: this should happen automatically
callback();
});
}
return that; return that;
} }
@ -5686,6 +5732,10 @@ requires
} }
} }
that.closePreview = function() {
that.$element.closePreview();
};
that.sortList = function(key, operator) { that.sortList = function(key, operator) {
self.options.sort = [{ self.options.sort = [{
key: key, key: key,
@ -6554,6 +6604,10 @@ requires
return that; return that;
}; };
that.closePreview = function() {
self.preview = false;
};
that.reload = function() { that.reload = function() {
clear(); clear();
that.clearCache(); that.clearCache();
@ -7072,7 +7126,7 @@ requires
}; };
that.closePreview = function() { that.closePreview = function() {
self.preview = false; that.$body.closePreview();
}; };
that.resizeColumn = function(id, width) { that.resizeColumn = function(id, width) {