fixed conflicts
This commit is contained in:
commit
2588a68e87
1 changed files with 1 additions and 5 deletions
|
@ -68,10 +68,6 @@ class WP_OpenPhoto {
|
||||||
?>
|
?>
|
||||||
<script>
|
<script>
|
||||||
jQuery(document).ready(function() {
|
jQuery(document).ready(function() {
|
||||||
var url_button_type;
|
|
||||||
jQuery(".url button").click(function() {
|
|
||||||
url_button_type = jQuery(this).html();
|
|
||||||
});
|
|
||||||
|
|
||||||
jQuery('.op-send-to-editor').click(function() {
|
jQuery('.op-send-to-editor').click(function() {
|
||||||
var parent_el, title_text, alt_text, caption_text, url_text, alignment, size, size_alt, op_single, img;
|
var parent_el, title_text, alt_text, caption_text, url_text, alignment, size, size_alt, op_single, img;
|
||||||
|
@ -91,7 +87,7 @@ class WP_OpenPhoto {
|
||||||
width = size_width;
|
width = size_width;
|
||||||
op_single = parent_el.find('#op-single').attr('name');
|
op_single = parent_el.find('#op-single').attr('name');
|
||||||
img = '';
|
img = '';
|
||||||
|
|
||||||
if (alt_text === "") {
|
if (alt_text === "") {
|
||||||
alt_text = title_text;
|
alt_text = title_text;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue