Fix minimize which broke again after previous CSS changes

This commit is contained in:
JC Brand 2014-01-22 17:45:16 +02:00
parent 7600018ff1
commit b189e6dfcb
2 changed files with 6 additions and 2 deletions

View File

@ -70,7 +70,6 @@ function DragResize(myName, config) {
handles: ['tl', 'tm', 'tr', handles: ['tl', 'tm', 'tr',
'ml', 'mr', 'bl', 'bm', 'br'], // Array of drag handles: top/mid/bot/right. 'ml', 'mr', 'bl', 'bm', 'br'], // Array of drag handles: top/mid/bot/right.
isElement: null, // Function ref to test for an element. isElement: null, // Function ref to test for an element.
isHandle: null, // Function ref to test for move handle.
element: null, // The currently selected element. element: null, // The currently selected element.
handle: null, // Active handle reference of the element. handle: null, // Active handle reference of the element.
minWidth: 10, minHeight: 10, // Minimum pixel size of elements. minWidth: 10, minHeight: 10, // Minimum pixel size of elements.
@ -155,7 +154,6 @@ DragResize.prototype.mouseDown = function(e) {
while (elm) { while (elm) {
// Loop up the DOM looking for matching elements. Remember one if found. // Loop up the DOM looking for matching elements. Remember one if found.
if (elm.className) { if (elm.className) {
if (!newHandle && (hRE.test(elm.className) || isHandle(elm))) newHandle = elm;
if (isElement(elm)) { newElement = elm; break } if (isElement(elm)) { newElement = elm; break }
} }
elm = elm.parentNode; elm = elm.parentNode;

View File

@ -487,6 +487,12 @@ $(document).ready(function () {
} else { } else {
$grandparent.find('div.chat-content').slideToggle(300); $grandparent.find('div.chat-content').slideToggle(300);
} }
var flyout = $grandparent.find('.box-flyout')[0];
if (flyout.style.height == 'auto') {
flyout.style.height = '324px';
} else {
flyout.style.height = 'auto';
}
$(ev.target).parent().parent().find('form.sendXMPPMessage').toggle(); $(ev.target).parent().parent().find('form.sendXMPPMessage').toggle();
}); });