diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2012-07-02 10:25:53 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2012-07-02 10:25:53 +0200 |
| commit | f5e0e5587d506129cf83cce337523a8c3d387856 (patch) | |
| tree | b3fc8c161979f6b068b9bc1016fbe6d28b69a312 | |
| parent | f8cebed3481d523ff43d438ac97048137f4f9902 (diff) | |
| parent | 5ff72f2cd7559ba39ad4f0a255debc02f38d4430 (diff) | |
| download | nextcloud-server-f5e0e5587d506129cf83cce337523a8c3d387856.tar.gz nextcloud-server-f5e0e5587d506129cf83cce337523a8c3d387856.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
| -rw-r--r-- | apps/files_sharing/js/share.js | 3 | ||||
| -rw-r--r-- | settings/js/users.js | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 9194d2240ab..39e6bd78590 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -360,7 +360,8 @@ $(document).ready(function() { $(this).select(); }); - $('#emailPrivateLink').live('submit', function() { + $('#emailPrivateLink').live('submit', function(event) { + event.preventDefault(); OC.Share.emailPrivateLink(); }); });
\ No newline at end of file diff --git a/settings/js/users.js b/settings/js/users.js index 90569bcc56b..c04df81d82f 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -221,6 +221,5 @@ $(document).ready(function(){ } } ); - location.reload(); }); }); |