fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-27 23:29:57 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.7.3.5(r13153:r13167)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/importer/tpl/js/importer_admin.js
View file

@ -11,7 +11,7 @@ jQuery(function($){
$('.checkxml')
.find('input:text')
.change(function(){
$(this).closest('.checkxml').find('.desr').hide();
$(this).closest('.checkxml').find('.x_help-inline').hide();
})
.end()
.find('button')
@ -22,20 +22,20 @@ $('.checkxml')
$form = $this.closest('form');
$container = $this.closest('.checkxml');
$input = $container.find('input').prop('disabled', true).addClass('loading');
$message = $container.find('.desc').hide();
$message = $container.find('.x_help-inline').hide();
function on_complete(data) {
var $ul, $ttxml, $xml;
$ul = $this.closest('ul');
$xml = $ul.find('>.xml');
$ttxml = $ul.find('>.ttxml');
//$ul = $this.closest('ul');
$xml = $form.find('>.xml');
$ttxml = $form.find('>.ttxml');
$message.text(data.result_message);
// when the file doesn't exists or any other error occurs
if(data.error || data.exists != 'true') {
$message.attr('class', 'desc error').fadeIn(300);
$message.attr('class', 'x_help-inline').fadeIn(300);
$ttxml = $ttxml.filter(':visible');
$ttxml.eq(-1).slideUp(100, function(){
$ttxml = $ttxml.slice(0,-1).eq(-1).slideUp(100,arguments.callee);
@ -44,7 +44,7 @@ $('.checkxml')
return restore();
}
$message.attr('class', 'desc success').fadeIn(300);
$message.attr('class', 'x_help-inline').fadeIn(300);
$form.find(':submit').removeAttr('disabled');
$syncmember = $form.find('.syncmember:hidden');
@ -71,8 +71,8 @@ $('.checkxml')
$.exec_json('importer.procImporterAdminCheckXmlFile', {filename:$.trim($input.val())}, on_complete);
})
.end()
.find('.desc').hide().end()
.closest('ul').find('>li.ttxml').hide().end().end()
.find('.x_help-inline').hide().end()
.closest('form').find('>.ttxml').hide().end().end()
.closest('form').find(':submit').attr('disabled','disabled');
// hide 'sync member' block
@ -109,7 +109,7 @@ function doPreProcessing(form, formId) {
// show modal window
$process = $('#process');
if(!$process.find('.bg').length) $process.prepend('<span class="bg" />').appendTo('body');
if(!$('body').children('.x_modal-backdrop').length) $('body').append('<div class="x_modal-backdrop" />');
$('a[href="#process"].modalAnchor').trigger('open.mw');
exec_xml(