提交 4a25b4a2 编写于 作者: 许金泉's avatar 许金泉

Merge remote-tracking branch 'origin/dev-1.4.3' into dev-1.4.3

......@@ -6,7 +6,7 @@ UE.plugin.register('copy', function () {
ZeroClipboard.config({
debug: false,
swfPath: me.options.UEDITOR_HOME_URL + '/third-party/zeroclipboard/ZeroClipboard.swf'
swfPath: me.options.UEDITOR_HOME_URL + 'third-party/zeroclipboard/ZeroClipboard.swf'
});
var client = me.zeroclipboard = new ZeroClipboard();
......@@ -45,7 +45,7 @@ UE.plugin.register('copy', function () {
initZeroClipboard();
} else {
utils.loadFile(document, {
src: me.options.UEDITOR_HOME_URL + "/third-party/zeroclipboard/ZeroClipboard.js",
src: me.options.UEDITOR_HOME_URL + "third-party/zeroclipboard/ZeroClipboard.js",
tag: "script",
type: "text/javascript",
defer: "defer"
......
......@@ -21,7 +21,7 @@ UE.plugin.register('snapscreen', function (){
search = a.search;
if (params) {
search = search ? search + params:'?' + params;
search = search + (search.indexOf('?') == -1 ? '?':'&')+ params;
search = search.replace(/[&]+/ig, '&');
}
return {
......
......@@ -257,7 +257,7 @@
if(!_this.listEnd && !this.isLoadingData) {
this.isLoadingData = true;
var url = editor.getOpt('serverUrl') + '?action=' + editor.getOpt('imageManagerActionName'),
var url = editor.getActionUrl(editor.getOpt('imageManagerActionName')),
isJsonp = utils.isCrossDomainUrl(url);
ajax.request(url, {
'timeout': 100000,
......
......@@ -855,7 +855,7 @@
if(!_this.listEnd && !this.isLoadingData) {
this.isLoadingData = true;
var url = editor.getOpt('serverUrl') + '?action=' + editor.getOpt('imageManagerActionName'),
var url = editor.getActionUrl(editor.getOpt('imageManagerActionName')),
isJsonp = utils.isCrossDomainUrl(url);
ajax.request(url, {
'timeout': 100000,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册