From b91477ef2e2af67d194f11344a3a0960f94d6266 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 20 Oct 2012 15:21:55 +0100 Subject: [PATCH] event log: fix Show All links. #1023 --- SparkleShare/Common/HTML/event-log.html | 2 +- SparkleShare/Mac/SparkleEventLog.cs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SparkleShare/Common/HTML/event-log.html b/SparkleShare/Common/HTML/event-log.html index 06a3d95e..a9db7c63 100755 --- a/SparkleShare/Common/HTML/event-log.html +++ b/SparkleShare/Common/HTML/event-log.html @@ -10,7 +10,7 @@ $('dl dd:nth-child(-n+10)').css('display', 'block'); $('.day-entry-content .event-entry:last-child').css('border', 'none'); - $('a').click(function (event) { + $('a').not('.show').click(function (event) { window.external.LinkClicked($(this).attr("href")); event.preventDefault(); }); diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs index b8d59df5..a1cd3d5b 100755 --- a/SparkleShare/Mac/SparkleEventLog.cs +++ b/SparkleShare/Mac/SparkleEventLog.cs @@ -262,8 +262,10 @@ namespace SparkleShare { PreventsApplicationTerminationWhenModal = false }; - if ((NSPanelButtonType) panel.RunModal ()== NSPanelButtonType.Ok) { - string target_file_path = Path.Combine (panel.DirectoryUrl.RelativePath, panel.NameFieldStringValue); + if ((NSPanelButtonType) panel.RunModal () == NSPanelButtonType.Ok) { + string target_file_path = Path.Combine (panel.DirectoryUrl.RelativePath, + panel.NameFieldStringValue); + Controller.SaveDialogCompleted (target_file_path); } else {