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

fex-team · Jun 4, 2014 · 4a25b4a · 4a25b4a
2 parents dacc92b + fec03db
commit 4a25b4a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/_src/plugins/copy.js b/_src/plugins/copy.js
@@ -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"

diff --git a/_src/plugins/snapscreen.js b/_src/plugins/snapscreen.js
@@ -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 {

diff --git a/dialogs/background/background.js b/dialogs/background/background.js
@@ -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,

diff --git a/dialogs/image/image.js b/dialogs/image/image.js