From 3b625eb2f1532e016e289f75fd7ee2a841fafad7 Mon Sep 17 00:00:00 2001 From: taggon Date: Thu, 4 Nov 2010 10:33:55 +0000 Subject: [PATCH] =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=8D=94=20=ED=94=8C?= =?UTF-8?q?=EB=9F=AC=EA=B7=B8=EC=9D=B8=EC=9D=98=20Flash=20Runtime=EC=9D=B4?= =?UTF-8?q?=20=EC=A0=95=EC=83=81=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=8F=99?= =?UTF-8?q?=EC=9E=91=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95(=EA=B3=84=EC=86=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7793 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/plugins/uploader/uploader.js | 17 +++++++++++------ common/js/plugins/uploader/uploader.swf | Bin 3573 -> 1846 bytes 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/common/js/plugins/uploader/uploader.js b/common/js/plugins/uploader/uploader.js index 2eac29527..0232c91d0 100644 --- a/common/js/plugins/uploader/uploader.js +++ b/common/js/plugins/uploader/uploader.js @@ -443,7 +443,7 @@ runtimes.flash = { var self = this; var rand = random(); var name = 'xe_flashuploader_object'+rand; - var swf = '/common/swf/uploader.swf'; + var swf = (window.request_uri||'/')+'common/js/plugins/uploader/uploader.swf?'+rand; if (!window.xe_flashuploaders) window.xe_flashuploaders = []; @@ -454,6 +454,7 @@ runtimes.flash = { var oh = b.offsetHeight; var ot = b.offsetTop; var ol = b.offsetLeft; + var $div, flash, css; if (typeof uploader.flashindex == 'undefined') { uploader.flashindex = xe_flashuploaders.length; @@ -477,11 +478,11 @@ runtimes.flash = { }); } - var flash = $.browser.msie?window[name]:document[name]; - var css = {position:'absolute',width:ow+'px',height:oh+'px',left:ol+'px',top:ot+'px',margin:0,padding:0,overflow:'hidden'}; + div = $('#'+name+'-container'); + css = {position:'absolute',width:ow+'px',height:oh+'px',left:ol+'px',top:ot+'px',margin:0,padding:0,overflow:'hidden'}; - if (!flash) { - var div = $('
').css(css).appendTo(op); + if (!div.length) { + div = $('
').attr('id', name+'-container').css(css).appendTo(op); div[0].innerHTML = '' + '' + '' @@ -490,11 +491,14 @@ runtimes.flash = { + '' + ''; - flash = $.browser.msie?window[name]:document[name]; } + flash = window[name] || document[name]; + if (!uploader.flash) { try { + if (!flash) throw ''; + var _settings = {}; var pass_keys = ['filters','params','url']; @@ -511,6 +515,7 @@ runtimes.flash = { return setTimeout(arguments.callee, 10); } } + if (uploader.flash) { uploader.flash_box.css(css); uploader.flash.setIndex(uploader.flashindex); diff --git a/common/js/plugins/uploader/uploader.swf b/common/js/plugins/uploader/uploader.swf index bcc4946dffe845381a49f18e310f99a9364968db..2cf2b63ec4d5ff09465498a7af029601d58f8f51 100644 GIT binary patch literal 1846 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