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

Merge remote-tracking branch 'xpressengine/master' into Cover-Image-MULTILANG

Browse source 
Conflicts:
	common/js/plugins/jquery.fileupload/js/main.min.js

min 파일은 자동 생성되리라 믿고 포기.
This commit is contained in:
MinSoo Kim 2015-08-21 00:10:19 +09:00
commit 8dfd018435
22 changed files with 132 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/js/plugins/jquery.fileupload/js/app.js
View file

@ -37,7 +37,7 @@
// send Blob objects via XHR requests:
disableImageResize: /Android(?!.*Chrome)|Opera/
.test(window.navigator.userAgent),
maxFileSize: 5000000,
maxFileSize: 999000,
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
});
}

2
common/js/plugins/jquery.fileupload/js/jquery.fileupload-image.js vendored
View file

@ -242,7 +242,7 @@
blob.name = file.name;
} else if (file.name) {
blob.name = file.name.replace(
/\..+$/,
/\.\w+$/,
'.' + blob.type.substr(6)
);
}

31
common/js/plugins/jquery.fileupload/js/jquery.fileupload.js vendored
View file

@ -1,5 +1,5 @@
/*
* jQuery File Upload Plugin 5.42.2
* jQuery File Upload Plugin 5.42.3
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2010, Sebastian Tschan
@ -277,7 +277,8 @@
// The following are jQuery ajax settings required for the file uploads:
processData: false,
contentType: false,
cache: false
cache: false,
timeout: 0
},
// A list of options that require reinitializing event listeners and/or
@ -983,7 +984,10 @@
fileSet,
i,
j = 0;
if (limitSize && (!filesLength || files[0].size === undefined)) {
if (!filesLength) {
return false;
}
if (limitSize && files[0].size === undefined) {
limitSize = undefined;
}
if (!(options.singleFileUploads || limit || limitSize) ||
@ -1344,18 +1348,19 @@
_initDataAttributes: function () {
var that = this,
options = this.options,
clone = $(this.element[0].cloneNode(false)),
data = clone.data();
// Avoid memory leaks:
clone.remove();
data = this.element.data();
// Initialize options set via HTML5 data-attributes:
$.each(
data,
function (key, value) {
var dataAttributeName = 'data-' +
// Convert camelCase to hyphen-ated key:
key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
if (clone.attr(dataAttributeName)) {
this.element[0].attributes,
function (index, attr) {
var key = attr.name.toLowerCase(),
value;
if (/^data-/.test(key)) {
// Convert hyphen-ated key to camelCase:
key = key.slice(5).replace(/-[a-z]/g, function (str) {
return str.charAt(1).toUpperCase();
});
value = data[key];
if (that._isRegExpOption(key, value)) {
value = that._getRegExp(value);
}

7
common/js/plugins/jquery.fileupload/js/main.js
View file

@ -60,6 +60,8 @@
last_selected_file: null,
});
var currentEnforce_ssl = window.enforce_ssl;
if(location.protocol == 'https:') { window.enforce_ssl = true; }
var settings = {
url: request_uri
@ -122,6 +124,8 @@
}
}
};
window.enforce_ssl = currentEnforce_ssl;
data.settings = $.extend({} , default_settings, settings, opt || {});
$container.data(data);
@ -287,7 +291,6 @@
obj.editor_sequence = data.editorSequence;
$.exec_json('file.getFileList', obj, function(res){
console.log(res);
data.uploadTargetSrl = res.upload_target_srl;
editorRelKeys[data.editorSequence].primary.value = res.upload_target_srl;
data.uploadTargetSrl = res.uploadTargetSrl;
@ -366,8 +369,6 @@
return u;
};
xe.unregisterApp();
})(jQuery);