From c255f02f0f107ba006b44eae1129cab148f44770 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 13 Jan 2015 13:55:52 -0700 Subject: [PATCH] Way simplify vAPI closePopup for Safari --- platform/safari/vapi-common.js | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/platform/safari/vapi-common.js b/platform/safari/vapi-common.js index dbf0fcdc9..83d4f1ce4 100644 --- a/platform/safari/vapi-common.js +++ b/platform/safari/vapi-common.js @@ -114,22 +114,10 @@ vAPI.i18n = function(s) { /******************************************************************************/ vAPI.closePopup = function() { - var safr = safari.extension.globalPage.contentWindow.safari; - var items = safr.extension.toolbarItems; - - for ( var i = 0; i < items.length; i++ ) { - if ( items[i].browserWindow !== safr.application.activeBrowserWindow ) { - continue; - } - - if ( items[i].popover && items[i].popover.visible ) { - items[i].popover.hide(); - } + var popover = safari.extension.popovers[0]; + if ( popover ) { + popover.hide(); } }; -/******************************************************************************/ - })(); - -/******************************************************************************/