Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1682602 - remove pinning and drag/drop support for sponsored top sites. r=dao

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D106309
This commit is contained in:
amy churchwell 2021-03-03 10:55:58 +00:00
parent 8e0285b790
commit d5277e99fa
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/components/newtab/content-src/components/TopSites/TopSite.jsx
View File

@ -51,10 +51,14 @@ export class TopSiteLink extends React.PureComponent {
}
break;
case "dragstart":
event.target.blur();
if (this.props.link.sponsored_position) {
event.preventDefault();
break;
}
this.dragged = true;
event.dataTransfer.effectAllowed = "move";
event.dataTransfer.setData("text/topsite-index", this.props.index);
event.target.blur();
this.props.onDragEvent(
event,
this.props.index,

2
browser/components/newtab/content-src/components/TopSites/TopSitesConstants.js
View File

@ -23,8 +23,6 @@ export const TOP_SITES_SPOC_CONTEXT_MENU_OPTIONS = [
"ShowPrivacyInfo",
];
export const TOP_SITES_SPONSORED_POSITION_CONTEXT_MENU_OPTIONS = [
"PinTopSite",
"Separator",
"OpenInNewWindow",
"OpenInPrivateWindow",
"Separator",

10
browser/components/newtab/data/content/activity-stream.bundle.js
View File

@ -8737,7 +8737,7 @@ __webpack_require__.r(__webpack_exports__);
const TOP_SITES_SOURCE = "TOP_SITES";
const TOP_SITES_CONTEXT_MENU_OPTIONS = ["CheckPinTopSite", "EditTopSite", "Separator", "OpenInNewWindow", "OpenInPrivateWindow", "Separator", "BlockUrl", "DeleteUrl"];
const TOP_SITES_SPOC_CONTEXT_MENU_OPTIONS = ["PinTopSite", "Separator", "OpenInNewWindow", "OpenInPrivateWindow", "Separator", "BlockUrl", "ShowPrivacyInfo"];
const TOP_SITES_SPONSORED_POSITION_CONTEXT_MENU_OPTIONS = ["PinTopSite", "Separator", "OpenInNewWindow", "OpenInPrivateWindow", "Separator", "BlockUrl", "AboutSponsored"]; // the special top site for search shortcut experiment can only have the option to unpin (which removes) the topsite
const TOP_SITES_SPONSORED_POSITION_CONTEXT_MENU_OPTIONS = ["OpenInNewWindow", "OpenInPrivateWindow", "Separator", "BlockUrl", "AboutSponsored"]; // the special top site for search shortcut experiment can only have the option to unpin (which removes) the topsite
const TOP_SITES_SEARCH_SHORTCUTS_CONTEXT_MENU_OPTIONS = ["CheckPinTopSite", "Separator", "BlockUrl"]; // minimum size necessary to show a rich icon instead of a screenshot
@ -9003,10 +9003,16 @@ class TopSiteLink extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureCompo
break;
case "dragstart":
event.target.blur();
if (this.props.link.sponsored_position) {
event.preventDefault();
break;
}
this.dragged = true;
event.dataTransfer.effectAllowed = "move";
event.dataTransfer.setData("text/topsite-index", this.props.index);
event.target.blur();
this.props.onDragEvent(event, this.props.index, this.props.link, this.props.title);
break;