(trunk web) #4979 "CSS Issues in Web Client" -- proposed fix. See ticket for more details.

This commit is contained in:
Jordan Lee
2012-07-20 17:37:50 +00:00
parent 6a3c7f34ec
commit 4a344d0656
5 changed files with 53 additions and 39 deletions

View File

@@ -76,10 +76,10 @@ Dialog.prototype = {
{
if (!isMobileDevice)
$('.dialog_container').hide();
setInnerHTML(this._heading[0], dialog_heading);
setInnerHTML(this._message[0], dialog_message);
setInnerHTML(this._cancel_button[0], cancel_button_label || 'Cancel');
setInnerHTML(this._confirm_button[0], confirm_button_label);
setTextContent(this._heading[0], dialog_heading);
setTextContent(this._message[0], dialog_message);
setTextContent(this._cancel_button[0], cancel_button_label || 'Cancel');
setTextContent(this._confirm_button[0], confirm_button_label);
this._confirm_button.show();
this._callback_function = callback_function;
this._callback_data = callback_data;
@@ -96,11 +96,11 @@ Dialog.prototype = {
alert: function(dialog_heading, dialog_message, cancel_button_label) {
if (!isMobileDevice)
$('.dialog_container').hide();
setInnerHTML(this._heading[0], dialog_heading);
setInnerHTML(this._message[0], dialog_message);
setTextContent(this._heading[0], dialog_heading);
setTextContent(this._message[0], dialog_message);
// jquery::hide() doesn't work here in Safari for some odd reason
this._confirm_button.css('display', 'none');
setInnerHTML(this._cancel_button[0], cancel_button_label);
setTextContent(this._cancel_button[0], cancel_button_label);
// Just in case
$('#upload_container').hide();
$('body').addClass('dialog_showing');