merge from 1.7.3.5(r13153:r13167)

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

View file

@ -81,31 +81,76 @@
}) (jQuery);
function addRow(ulId){
function addRow(){
var $ = jQuery;
var count = $('#'+ulId).children().length;
var clone = $('#'+ulId).find('li:last-child').prev().clone();
$('#'+ulId).find('li:last-child').prev().find('.__addBtn').hide();
var $attributes = $('.__attribute');
var $last = $attributes.last();
var count = $last.data('count') + 1;
var $clone = $last.clone().data('count', count);
$last.find('.__addBtn').hide();
clone.find('input[name^="attribute_name"]').attr("name", "attribute_name"+count).attr('value', '')
.attr("id", "attribute_name"+count)
.prev('label').attr('for', 'attribute_name'+count);
clone.find('input[name^="attribute_value"]').attr("name", "attribute_value"+count).attr('value', '')
.attr("id", "attribute_value"+count)
.prev('label').attr('for', 'attribute_value'+count);
$clone.find('.__attribute_name').attr('value', '').attr("id", "attribute_name"+count);
$clone.find('.__attribute_name_label').attr('for', 'attribute_name'+count);
$clone.find('.__attribute_value').attr('value', '').attr("id", "attribute_value"+count);
$clone.find('.__attribute_value_label').attr('for', 'attribute_value'+count);
$('#'+ulId).find('li:last-child').before(clone);
$last.after($clone);
}
function clearRow(target){
var $ = jQuery;
var ulTag = $(target).closest('ul');
var count = ulTag.children().length - 1;
var $attributes = $('.__attribute');
var $controlGroup = $(target).closest('.x_control-group');
var count = $attributes.length;
if (count <= 1){
ulTag.find('li:last-child').prev().find('.__addBtn').show();
return;
}
$(target).closest('li').remove();
ulTag.find('li:last-child').prev().find('.__addBtn').show();
$controlGroup.remove();
$('.__attribute').last().find('.__addBtn').show();
}
var $current_filebox;
jQuery(document).ready(function($){
$('.filebox').bind('before-open.mw', function(){
var $attributes = $('.__attribute');
var count = $attributes.length;
for(var i = count - 1; i > 0; i--){
clearRow($($attributes.get(i)));
}
$('#new_filebox_upload').find('input[name^=attribute_name], input[name^=attribute_value], input[name=addfile]').val('');
});
$('.filebox').click(function(){
$current_filebox = $(this);
});
$('#new_filebox_upload').submit(function(){
if ($('iframe[name=iframeTarget]').length < 1){
var $iframe = $(document.createElement('iframe'));
$iframe.css('display', 'none');
$iframe.attr('src', '#');
$iframe.attr('name', 'iframeTarget');
$iframe.load(function(){
var data = eval('(' + $(window.iframeTarget.document.getElementsByTagName("body")[0]).html() + ')');
if (data.error){
alert(data.message);
return;
}
$current_filebox.trigger('filebox.selected', [data.save_filename]);
$current_filebox.trigger('close.mw');
});
$('body').append($iframe.get(0));
$(this).attr('target', 'iframeTarget');
}
});
});