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

merge from branch luminous (version 1.5.4.2, ~r12561)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/editor/tpl/js/uploader.js
View file

@ -88,6 +88,11 @@ function start(cfg) {
uploaderStatusID : cfg.uploaderStatusID
};
if(typeof(enforce_ssl)!=="undefined" && enforce_ssl)
{
settings.upload_url = request_uri+'index.php';
};
// preview
$('#'+cfg.fileListAreaID).click(previewFiles);
@ -137,7 +142,7 @@ function _true(){ return true };
defaultHandlers = {
onFileQueued : _true,
onFileQueueError : function(flie, errorCode, message) {
onFileQueueError : function(file, errorCode, message) {
try {
switch(errorCode) {
case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED :