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

Merge pull request #1452 from YJSoft/fix/imagegallery

Browse source 
#1450 업로더와 상관 없이 이미지 갤러리 컴포넌트를 사용할수 있게 수정
This commit is contained in:
bnu 2015-05-19 14:03:06 +09:00
commit 1edf7e2753
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/editor/components/image_gallery/tpl/popup.js
View file

@ -1,4 +1,5 @@
var selected_node = null;
var files = [];
function getSlideShow() {
var node, $node, selected_images = '', width, style, align, border_color, bg_color, thickness;
@ -33,27 +34,23 @@ function getSlideShow() {
// 부모창의 업로드된 파일중 이미지 목록을 모두 가져와서 세팅
var fo = get_by_id("fo");
var editor_sequence = fo.editor_sequence.value;
var list_obj = get_by_id("image_list");
var parent_list_obj = opener.get_by_id("uploaded_file_list_"+editor_sequence);
if(parent_list_obj) {
jQuery.exec_json('file.getFileList', {'editor_sequence': editor_sequence}, function(res) {
jQuery.each(res.files, function (index, file) {
var file_srl = file.file_srl;
var list_obj = get_by_id("image_list");
for(var i=0;i<parent_list_obj.length;i++) {
var opt = parent_list_obj.options[i];
var file_srl = opt.value;
if(!file_srl) return;
var file_obj = opener.uploadedFiles[file_srl];
var filename = file_obj.download_url.replace(request_uri,'');
if((/(jpg|jpeg|gif|png)$/i).test(filename)) {
var filename = file.source_filename;
if(/\.(jpe?g|png|gif)$/i.test(filename)) {
var selected = false;
if(selected_images.indexOf(filename)!=-1) selected = true;
var opt = new Option(opt.text, opt.value, false, selected);
var opt = new Option(file.source_filename, file_srl, false, selected);
list_obj.options.add(opt);
files[file.file_srl] = file;
}
}
}
});
});
}
function insertSlideShow() {
@ -65,7 +62,7 @@ function insertSlideShow() {
var opt = list_obj.options[i];
if(opt.selected) {
var file_srl = opt.value;
var file_obj = opener.uploadedFiles[file_srl];
var file_obj = files[file_srl];
var filename = file_obj.download_url.replace(request_uri,'');
list[list.length] = filename;
}