fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 04:24:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Minor fix. Modal window '.x_modal-backdrop' duplicated issue.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11672 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-10-11 23:03:46 +00:00
parent 94d216fe21
commit 8f6a6c28c6
2 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/admin/tpl/js/admin.js
View file

@ -187,9 +187,6 @@ $.fn.xeModalWindow = function(){
// set state : showing // set state : showing
$modal.data('state', 'showing'); $modal.data('state', 'showing');
// workaroud for IE6
$('html,body').addClass('modalContainer');
// after event trigger // after event trigger
function after(){ $this.trigger('after-open.mw') }; function after(){ $this.trigger('after-open.mw') };
@ -202,8 +199,8 @@ $.fn.xeModalWindow = function(){
$modal $modal
.fadeIn(duration, after) .fadeIn(duration, after)
.find('button.x_close:first').focus(); .find('button.x_close:first').focus().end()
$('.x_modal-backdrop').show(); .prev('.x_modal-backdrop').show();
}) })
.bind('close.mw', function(){ .bind('close.mw', function(){
var $this = $(this), before_event, $modal, duration; var $this = $(this), before_event, $modal, duration;
@ -224,14 +221,11 @@ $.fn.xeModalWindow = function(){
// set state : hiding // set state : hiding
$modal.data('state', 'hiding'); $modal.data('state', 'hiding');
// workaroud for IE6
$('html,body').removeClass('modalContainer');
// after event trigger // after event trigger
function after(){ $this.trigger('after-close.mw') }; function after(){ $this.trigger('after-close.mw') };
$modal.fadeOut(duration, after); $modal.fadeOut(duration, after)
$('.x_modal-backdrop').hide(); .prev('.x_modal-backdrop').hide();
$this.focus(); $this.focus();
}); });
$('div.x_modal').addClass('x').hide(); $('div.x_modal').addClass('x').hide();

14
modules/admin/tpl/js/admin.min.js vendored
View file

@ -187,9 +187,6 @@ $.fn.xeModalWindow = function(){
// set state : showing // set state : showing
$modal.data('state', 'showing'); $modal.data('state', 'showing');
// workaroud for IE6
$('html,body').addClass('modalContainer');
// after event trigger // after event trigger
function after(){ $this.trigger('after-open.mw') }; function after(){ $this.trigger('after-open.mw') };
@ -202,8 +199,8 @@ $.fn.xeModalWindow = function(){
$modal $modal
.fadeIn(duration, after) .fadeIn(duration, after)
.find('button.x_close:first').focus(); .find('button.x_close:first').focus().end()
$('.x_modal-backdrop').show(); .prev('.x_modal-backdrop').show();
}) })
.bind('close.mw', function(){ .bind('close.mw', function(){
var $this = $(this), before_event, $modal, duration; var $this = $(this), before_event, $modal, duration;
@ -224,14 +221,11 @@ $.fn.xeModalWindow = function(){
// set state : hiding // set state : hiding
$modal.data('state', 'hiding'); $modal.data('state', 'hiding');
// workaroud for IE6
$('html,body').removeClass('modalContainer');
// after event trigger // after event trigger
function after(){ $this.trigger('after-close.mw') }; function after(){ $this.trigger('after-close.mw') };
$modal.fadeOut(duration, after); $modal.fadeOut(duration, after)
$('.x_modal-backdrop').hide(); .prev('.x_modal-backdrop').hide();
$this.focus(); $this.focus();
}); });
$('div.x_modal').addClass('x').hide(); $('div.x_modal').addClass('x').hide();