mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Fixed minor issue with merging
This commit is contained in:
parent
b20558cb99
commit
351928a1e0
@ -412,6 +412,14 @@ function checkBinaryPathExists(binaryPathArray, selectedServerVersion) {
|
|||||||
return (serverSpecificPathExist | foundDefaultPath);
|
return (serverSpecificPathExist | foundDefaultPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* If a function, then evaluate */
|
||||||
|
export function evalFunc(obj, func, param) {
|
||||||
|
if(_.isFunction(func)) {
|
||||||
|
return func.apply(obj, [param]);
|
||||||
|
}
|
||||||
|
return func;
|
||||||
|
}
|
||||||
|
|
||||||
export function registerDetachEvent(panel){
|
export function registerDetachEvent(panel){
|
||||||
panel.on(wcDocker.EVENT.DETACHED, function() {
|
panel.on(wcDocker.EVENT.DETACHED, function() {
|
||||||
$((this.$container)[0].ownerDocument).find('.wcIFrameFloating').attr({
|
$((this.$container)[0].ownerDocument).find('.wcIFrameFloating').attr({
|
||||||
@ -435,11 +443,4 @@ export function registerDetachEvent(panel){
|
|||||||
$((this.$container)[0].ownerDocument).find('.wcIFrameFloating').css('width', width);
|
$((this.$container)[0].ownerDocument).find('.wcIFrameFloating').css('width', width);
|
||||||
$((this.$container)[0].ownerDocument).find('.wcIFrameFloating').find('.wcIFrameFloating').css('height', height);
|
$((this.$container)[0].ownerDocument).find('.wcIFrameFloating').find('.wcIFrameFloating').css('height', height);
|
||||||
});
|
});
|
||||||
|
|
||||||
/* If a function, then evaluate */
|
|
||||||
export function evalFunc(obj, func, param) {
|
|
||||||
if(_.isFunction(func)) {
|
|
||||||
return func.apply(obj, [param]);
|
|
||||||
}
|
|
||||||
return func;
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user