From 1fc41a7bfc507e6f041e2db34ebf044a49e928a5 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 29 Jul 2011 12:11:53 -0400 Subject: [PATCH] Integrate sharing app with the new interface --- apps/files_sharing/appinfo/app.php | 2 +- apps/files_sharing/js/share.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 879bd1ea0e..9d8057a6fe 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -8,6 +8,6 @@ OC_APP::addNavigationEntry( array( "id" => "files_sharing_list", "order" => 10, "href" => OC_HELPER::linkTo( "files_sharing", "list.php" ), "name" => "Share", - "icon" => OC_HELPER::imagePath( "files_sharing", "share.png" ))); + "icon" => OC_HELPER::imagePath( "core", "actions/share.png" ))); ?> \ No newline at end of file diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 32926c6811..0562c3cb13 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -1,6 +1,5 @@ $(document).ready(function() { - $('.share').click(function(event) { - event.preventDefault(); + FileActions.register('all', 'Share', OC.imagePath('core', 'actions/share'), function(filename) { var html = "
"; html += ""; html += "";