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

Merge branch 'master' into develop

Browse source 
Conflicts:
	common/js/common.js
	common/js/xe.js
	common/js/xe.min.js
	modules/editor/skins/xpresseditor/js/xpresseditor.min.js
This commit is contained in:
bnu 2014-09-17 14:27:29 +09:00
commit 5c4b313eeb
19 changed files with 156 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/editor/components/image_gallery/tpl/popup.min.css vendored
View file

File diff suppressed because one or more lines are too long

2
modules/editor/skins/xpresseditor/js/xpresseditor.min.js vendored
View file

File diff suppressed because one or more lines are too long

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

@ -115,6 +115,7 @@ var uploadAutosaveChecker = false;
}
if(is_def(window.xeVid)) settings.post_params.vid = xeVid;
settings.sessionName = cfg.sessionName;
settings.post_params[cfg.sessionName] = getCookie(cfg.sessionName);
uploaderSettings[seq] = settings;
@ -166,6 +167,7 @@ var uploadAutosaveChecker = false;
},
onFileDialogComplete : function(numFilesSelected, numFilesQueued) {
try {
this.addPostParam(this.settings.sessionName, getCookie(this.settings.sessionName));
this.startUpload();
} catch (e) {
this.debug(e);
@ -173,6 +175,7 @@ var uploadAutosaveChecker = false;
},
onUploadStart : _true,
onUploadProgress : function(file, bytesLoaded, bytesTotal) {
this.addPostParam(this.settings.sessionName, getCookie(this.settings.sessionName));
try {
var $list, $lastopt, percent, filename;

2
modules/editor/tpl/js/uploader.min.js vendored
View file

File diff suppressed because one or more lines are too long