wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset b9cee613c432 (bug 999865) for bc1 bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2014-05-13 20:29:28 -07:00
parent 486fb70cea
commit 89b7bae7d0
1 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
browser/base/content/browser-social.js
View File

@ -49,9 +49,6 @@ XPCOMUtils.defineLazyGetter(this, "CreateSocialMarkWidget", function() {
return tmp.CreateSocialMarkWidget; return tmp.CreateSocialMarkWidget;
}); });
XPCOMUtils.defineLazyModuleGetter(this, "UITour",
"resource:///modules/UITour.jsm");
SocialUI = { SocialUI = {
_initialized: false, _initialized: false,
@ -183,37 +180,6 @@ SocialUI = {
// This handles "ActivateSocialFeature" events fired against content documents // This handles "ActivateSocialFeature" events fired against content documents
// in this window. // in this window.
_highlight: function(elId) {
let node = document.getElementById(elId);
if (node._highlightTarget)
return;
function _hide(aEvent, aNode) {
if (!aNode) {
aNode = aEvent.target;
}
clearTimeout(aNode._highlightTarget.timeout);
aNode.removeEventListener("click", aNode._highlightTarget.fnHide);
UITour.hideHighlight(window);
delete aNode._highlightTarget;
}
let target = {
targetName: elId,
node: node,
};
// hookup two events that remove highlight. one is a timeout of 5s,
// the other is clicking on the button.
let _highlightTarget = {
timeout: setTimeout(_hide, 5000, null, node),
fnHide: _hide
};
node.addEventListener("click", _highlightTarget.fnHide);
node._highlightTarget = _highlightTarget;
UITour.showHighlight(target, "wobble");
},
_activationEventHandler: function SocialUI_activationHandler(e) { _activationEventHandler: function SocialUI_activationHandler(e) {
let targetDoc; let targetDoc;
let node; let node;
@ -260,34 +226,14 @@ SocialUI = {
return; return;
} }
} }
Social.installProvider(targetDoc, data, function(manifest) {
Social.installProvider(targetDoc, data, (manifest) => { Social.activateFromOrigin(manifest.origin, function(provider) {
Social.activateFromOrigin(manifest.origin, (provider) => {
if (provider.sidebarURL) { if (provider.sidebarURL) {
SocialSidebar.show(provider.origin); SocialSidebar.show(provider.origin);
} }
if (provider.postActivationURL) { if (provider.postActivationURL) {
openUILinkIn(provider.postActivationURL, "tab"); openUILinkIn(provider.postActivationURL, "tab");
} }
// toggle the ui indicators. The UITour indicator only works with one
// button at a time, so we only use one of these in cases where the
// provider has more than one. This is rare at this time.
if (provider.shareURL) {
this._highlight("social-share-button");
// make this new provider the selected provider. If the panel hasn't
// been opened, we need to make the frame first.
SocialShare._createFrame();
SocialShare.iframe.setAttribute('src', 'about:blank');
SocialShare.iframe.setAttribute('origin', provider.origin);
// get the right button selected
SocialShare.populateProviderMenu();
} else if (provider.statusURL) {
let targetName = SocialStatus._toolbarHelper.idFromOrigin(provider.origin);
this._highlight(targetName);
} else if (provider.markURL) {
let targetName = SocialMarks._toolbarHelper.idFromOrigin(provider.origin);
this._highlight(targetName);
}
}); });
}); });
}, },