@@ -97,13 +97,11 @@ module Growl context = {} context[:user_click_context] = options[:click_context] if options[:click_context] - context[:user_click_context] = @application_name if options[:click_context].nil? && always_callback - if block_given? @callbacks[callback.object_id] = callback context[:callback_object_id] = callback.object_id.to_s end - dict[:NotificationClickContext] = context unless context.empty? + dict[:NotificationClickContext] = context if always_callback || !context.empty? notification_center.postNotificationName_object_userInfo_deliverImmediately(:GrowlNotification, nil, dict, true) end @@ -116,7 +114,6 @@ module Growl user_context = nil if context = notification.userInfo[GROWL_KEY_CLICKED_CONTEXT] user_context = context[:user_click_context] - user_context = nil if always_callback && user_context == @application_name if callback_object_id = context[:callback_object_id] @callbacks.delete(callback_object_id.to_i).call end @@ -130,7 +127,6 @@ module Growl if context = notification.userInfo[GROWL_KEY_CLICKED_CONTEXT] @callbacks.delete(context[:callback_object_id].to_i) if context[:callback_object_id] user_context = context[:user_click_context] - user_context = nil if always_callback && user_context == @application_name end @delegate.growlNotifierTimedOut_context(self, user_context) if @delegate && @delegate.respond_to?(:growlNotifierTimedOut_context) lib/growl.rb @@ -160,7 +160,7 @@ describe "Growl::Notifier.sharedInstance" do :NotificationTitle => 'title', :NotificationDescription => 'description', :NotificationPriority => 0, - :NotificationClickContext => { :user_click_context => @name } + :NotificationClickContext => {} } @center.expects(:postNotificationName_object_userInfo_deliverImmediately).with(:GrowlNotification, nil, dict, true) @@ -210,7 +210,7 @@ describe "Growl::Notifier.sharedInstance" do it "should send a message to the delegate without a click_context if always_callback is enabled and no :click_context was specified" do @instance.always_callback = true - notification = stubbed_notification(:user_click_context => @name) + notification = stubbed_notification({}) assign_delegate.expects(:growlNotifierClicked_context).with(@instance, nil) @instance.onClicked(notification) end @@ -239,14 +239,6 @@ describe "Growl::Notifier.sharedInstance" do @instance.onTimeout(notification) end - it "should send a message to the delegate if a notification times out, without a click_context if always_callback is enabled and no :click_context was specified" do - @instance.always_callback = true - notification = stubbed_notification(:user_click_context => @name) - assign_delegate.expects(:growlNotifierTimedOut_context).with(@instance, nil) - - @instance.onTimeout(notification) - end - it "should not send a message to the delegate if a notification times out but the delegate doesn't respond to the delegate method" do assign_delegate @instance.onTimeout(stubbed_notification) test/growl_test.rb 9e4e0359a8789e949c21b6d79d8ec8f5476846e2 Satoshi Nakagawa psychs@limechat.net http://github.com/psychs/growlnotifier/commit/4323279367737d584e85dc7531f3c9c0300e9996 4323279367737d584e85dc7531f3c9c0300e9996 2008-11-20T12:59:29-08:00 2008-11-20T12:59:29-08:00 callback with context=nil when always_callback=true without :click_context dd6339f840e630b3e9770619cdbbad1e7c9ed479 Satoshi Nakagawa psychs@limechat.net