mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-02 14:18:46 +02:00
"Insert Media" dialog: Reposition separately (fixes #783)
FF21 and IE10 seem to propagate the DOM attribute changes differently from Chrome: The dimensions can't be set in the same setOptions() call through jQuery UI here. Fixed this by a separate setOption() call.
This commit is contained in:
parent
2f9eaeea41
commit
8c9ef8feb9
@ -207,12 +207,8 @@
|
|||||||
opts.height = newHeight;
|
opts.height = newHeight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(this.options.autoPosition) {
|
|
||||||
opts.position = this.options.position;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!jQuery.isEmptyObject(opts)) {
|
if(!jQuery.isEmptyObject(opts)) {
|
||||||
// Resize dialog
|
|
||||||
this._setOptions(opts);
|
this._setOptions(opts);
|
||||||
|
|
||||||
// Resize iframe within dialog
|
// Resize iframe within dialog
|
||||||
@ -226,6 +222,11 @@
|
|||||||
- parseFloat(this.element.css('paddingTop'))
|
- parseFloat(this.element.css('paddingTop'))
|
||||||
- parseFloat(this.element.css('paddingBottom'))
|
- parseFloat(this.element.css('paddingBottom'))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Enforce new position
|
||||||
|
if(this.options.autoPosition) {
|
||||||
|
this._setOption("position", this.options.position);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user