#204756 by dvessel: textarea.js assumed #disabled fields are to be hidden
parent
1ac7418865
commit
adf836896a
|
@ -70,13 +70,20 @@ Drupal.behaviors.teaser = function(context) {
|
|||
body[0].value = trim(text[1]);
|
||||
$(teaser).attr('disabled', '');
|
||||
$('input', button).val(Drupal.t('Join summary')).toggle(join_teaser, split_teaser);
|
||||
$(teaser).show();
|
||||
}
|
||||
else {
|
||||
$(teaser).hide();
|
||||
$('input', button).val(Drupal.t('Split summary at cursor')).toggle(split_teaser, join_teaser);
|
||||
$(checkbox).hide();
|
||||
}
|
||||
|
||||
// Make sure that textarea.js has done its magic to ensure proper visibility state.
|
||||
if (Drupal.behaviors.textarea && teaser.is(('.form-textarea:not(.textarea-processed)'))) {
|
||||
Drupal.behaviors.textarea(teaser.parentNode);
|
||||
}
|
||||
// Set initial visibility
|
||||
if ($(teaser).is('[@disabled]')) {
|
||||
$(teaser).parent().hide();
|
||||
}
|
||||
|
||||
});
|
||||
};
|
||||
|
|
|
@ -4,22 +4,11 @@ Drupal.behaviors.textarea = function(context) {
|
|||
$('textarea.resizable:not(.textarea-processed)', context).each(function() {
|
||||
var textarea = $(this).addClass('textarea-processed'), staticOffset = null;
|
||||
|
||||
// Make sure that teaser.js has done its magic before converting this textarea.
|
||||
if (Drupal.behaviors.teaser && textarea.is(('.teaser:not(.teaser-processed)'))) {
|
||||
Drupal.behaviors.teaser(this.parentNode);
|
||||
}
|
||||
|
||||
// When wrapping the text area, work around an IE margin bug. See:
|
||||
// http://jaspan.com/ie-inherited-margin-bug-form-elements-and-haslayout
|
||||
$(this).wrap('<div class="resizable-textarea"><span></span></div>')
|
||||
.parent().append($('<div class="grippie"></div>').mousedown(startDrag));
|
||||
|
||||
// Inherit visibility
|
||||
if ($(this).is('[@disabled]')) {
|
||||
$(this).parent().hide();
|
||||
$(this).show();
|
||||
}
|
||||
|
||||
var grippie = $('div.grippie', $(this).parent())[0];
|
||||
grippie.style.marginRight = (grippie.offsetWidth - $(this)[0].offsetWidth) +'px';
|
||||
|
||||
|
|
|
@ -392,6 +392,10 @@ a.tabledrag-handle-hover .handle {
|
|||
background-position: center 1px;
|
||||
margin-bottom: -2px;
|
||||
}
|
||||
/* Keeps inner content contained in Opera 9. */
|
||||
.teaser-checkbox {
|
||||
padding-top: 1px;
|
||||
}
|
||||
div.teaser-button-wrapper {
|
||||
float: right; /* LTR */
|
||||
padding-right: 5%; /* LTR */
|
||||
|
|
Loading…
Reference in New Issue