Merge branch 'MDL-51854-master' of https://github.com/pauln/moodle

ralferlebach · Nov 2, 2015 · deec056 · deec056
2 parents 693ed49 + ca50279
commit deec056
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...r/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js b/...r/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
@@ -333,8 +333,8 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             };
             xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
             xhr.send(formData);
+            return false;
         }
-        return false;
 
 },
 

diff --git a/...tor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js b/...tor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
@@ -333,8 +333,8 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             };
             xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
             xhr.send(formData);
+            return false;
         }
-        return false;
 
 },
 

diff --git a/lib/editor/atto/plugins/image/yui/src/button/js/button.js b/lib/editor/atto/plugins/image/yui/src/button/js/button.js
@@ -331,8 +331,8 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             };
             xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
             xhr.send(formData);
+            return false;
         }
-        return false;
 
 },