Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Refactor and tweaks for contextMenu.js #2329

Merged
merged 1 commit into from
Jun 29, 2016
Merged

Refactor and tweaks for contextMenu.js #2329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/extensions/brave/locales/en-US/menu.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ copyLinkAddress=Copy Link Address
copyEmailAddress=Copy Email Address
saveLinkAs=Save Link As...
saveImage=Save Image...
openImageInNewTab=Open image in new tab
copyImageAddress=Copy image address
openImageInNewTab=Open Image in New Tab
copyImageAddress=Copy Image Address
viewPageSource=View Page Source
addToReadingList=Add to reading list
quit=Quit
Expand Down
181 changes: 95 additions & 86 deletions js/contextMenus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,12 @@ function bookmarkTemplateInit (siteDetail, activeFrame) {
const location = siteDetail.get('location')
const isFolder = siteDetail.get('tags').includes(siteTags.BOOKMARK_FOLDER)
const template = []

if (!isFolder) {
template.push(openInNewTabMenuItem(location, undefined, siteDetail.get('partitionNumber')),
openInNewPrivateTabMenuItem(location),
openInNewSessionTabMenuItem(location),
copyLinkLocationMenuItem(location),
copyAddressMenuItem('copyLinkAddress', location),
CommonMenu.separatorMenuItem)
} else {
template.push(openAllInNewTabsMenuItem(appStoreRenderer.state.get('sites'), siteDetail),
Expand Down Expand Up @@ -239,6 +240,7 @@ function bookmarkTemplateInit (siteDetail, activeFrame) {

template.push(addBookmarkMenuItem('addBookmark', siteUtil.getDetailFromFrame(activeFrame, siteTags.BOOKMARK), siteDetail, true),
addFolderMenuItem(siteDetail, true))

return template
}

Expand Down Expand Up @@ -632,11 +634,24 @@ const openInNewSessionTabMenuItem = (location, parentFrameKey) => {
}
}

const copyLinkLocationMenuItem = (location) => {
const saveAsMenuItem = (label, location) => {
return {
label: locale.translation('copyLinkAddress'),
click: () => {
clipboard.writeText(location)
label: locale.translation(label),
click: (item, focusedWindow) => {
if (focusedWindow && location) {
focusedWindow.webContents.downloadURL(location)
}
}
}
}

const copyAddressMenuItem = (label, location) => {
return {
label: locale.translation(label),
click: (item, focusedWindow) => {
if (focusedWindow && location) {
clipboard.writeText(location)
}
}
}
}
Expand Down Expand Up @@ -675,6 +690,7 @@ const showDefinitionMenuItem = (selectionText) => {

function mainTemplateInit (nodeProps, frame) {
const template = []

if (nodeProps.frameURL && nodeProps.frameURL.startsWith('chrome-extension://mnojpmjdmbbfmejpflffifhffcmidifd/about-flash.html')) {
const pageOrigin = siteUtil.getOrigin(nodeProps.pageURL)
template.push({
Expand All @@ -692,7 +708,12 @@ function mainTemplateInit (nodeProps, frame) {
return template
}

if (nodeProps.linkURL !== '') {
const isLink = nodeProps.linkURL && nodeProps.linkURL !== ''
const isImage = nodeProps.mediaType === 'image'
const isInputField = nodeProps.isEditable || nodeProps.inputFieldType !== 'none'
const isTextSelected = nodeProps.selectionText.length > 0

if (isLink) {
template.push(openInNewTabMenuItem(nodeProps.linkURL, frame.get('isPrivate'), frame.get('partitionNumber'), frame.get('key')),
openInNewPrivateTabMenuItem(nodeProps.linkURL, frame.get('key')),
openInNewWindowMenuItem(nodeProps.linkURL, frame.get('isPrivate'), frame.get('partitionNumber')),
Expand All @@ -703,52 +724,37 @@ function mainTemplateInit (nodeProps, frame) {
if (nodeProps.linkURL.toLowerCase().startsWith('mailto:')) {
template.push(copyEmailAddressMenuItem(nodeProps.linkURL))
} else {
template.push(copyLinkLocationMenuItem(nodeProps.linkURL), {
label: locale.translation('saveLinkAs'),
click: (item, focusedWindow) => {
if (focusedWindow && nodeProps.linkURL) {
focusedWindow.webContents.downloadURL(nodeProps.linkURL)
}
}
},
CommonMenu.separatorMenuItem)
template.push(
saveAsMenuItem('saveLinkAs', nodeProps.linkURL),
copyAddressMenuItem('copyLinkAddress', nodeProps.linkURL),
CommonMenu.separatorMenuItem)
}
}

if (nodeProps.mediaType === 'image') {
if (isImage) {
template.push({
label: locale.translation('saveImage'),
click: (item, focusedWindow) => {
if (focusedWindow && nodeProps.srcURL) {
focusedWindow.webContents.downloadURL(nodeProps.srcURL)
}
}
}, {
label: locale.translation('openImageInNewTab'),
click: (item, focusedWindow) => {
if (focusedWindow && nodeProps.srcURL) {
// TODO: open this in the next tab instead of last tab
focusedWindow.webContents.send(messages.SHORTCUT_NEW_FRAME, nodeProps.srcURL)
}
}
}, {
label: locale.translation('copyImageAddress'),
click: (item, focusedWindow) => {
if (focusedWindow && nodeProps.srcURL) {
clipboard.writeText(nodeProps.srcURL)
label: locale.translation('openImageInNewTab'),
click: (item, focusedWindow) => {
if (focusedWindow && nodeProps.srcURL) {
// TODO: open this in the next tab instead of last tab
focusedWindow.webContents.send(messages.SHORTCUT_NEW_FRAME, nodeProps.srcURL)
}
}
}
}, CommonMenu.separatorMenuItem)
},
saveAsMenuItem('saveImage', nodeProps.srcURL),
copyAddressMenuItem('copyImageAddress', nodeProps.srcURL),
CommonMenu.separatorMenuItem)
}

if (nodeProps.isEditable || nodeProps.inputFieldType !== 'none') {
if (isInputField) {
let misspelledSuggestions = []
if (nodeProps.misspelledWord) {
const info = ipc.sendSync(messages.GET_MISSPELLING_INFO, nodeProps.selectionText)
if (info) {
misspelledSuggestions = getMisspelledSuggestions(nodeProps.selectionText, info.isMisspelled, info.suggestions)
}
}

const editableItems = getEditableItems(nodeProps.selectionText, nodeProps.editFlags)
template.push(...misspelledSuggestions, {
label: locale.translation('undo'),
Expand All @@ -759,71 +765,74 @@ function mainTemplateInit (nodeProps, frame) {
accelerator: 'Shift+CmdOrCtrl+Z',
role: 'redo'
}, CommonMenu.separatorMenuItem, ...editableItems, CommonMenu.separatorMenuItem)
} else if (nodeProps.selectionText.length > 0) {
} else if (isTextSelected) {
if (isDarwin) {
template.push(showDefinitionMenuItem(nodeProps.selectionText),
CommonMenu.separatorMenuItem
)
}

template.push(searchSelectionMenuItem(nodeProps.selectionText), {
label: locale.translation('copy'),
accelerator: 'CmdOrCtrl+C',
role: 'copy'
}, CommonMenu.separatorMenuItem)
} else {
if (nodeProps.linkURL) {
template.push(addBookmarkMenuItem('bookmarkLink', {
location: nodeProps.linkURL,
tags: [siteTags.BOOKMARK]
}, false))
} else {
template.push(
{
label: locale.translation('back'),
enabled: frame.get('canGoBack'),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_BACK)
if (!isImage) {
if (isLink) {
template.push(addBookmarkMenuItem('bookmarkLink', {
location: nodeProps.linkURL,
tags: [siteTags.BOOKMARK]
}, false))
} else {
template.push(
{
label: locale.translation('back'),
enabled: frame.get('canGoBack'),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_BACK)
}
}
}
}, {
label: locale.translation('forward'),
enabled: frame.get('canGoForward'),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_FORWARD)
}, {
label: locale.translation('forward'),
enabled: frame.get('canGoForward'),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_FORWARD)
}
}
}
}, {
label: locale.translation('reloadPage'),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_RELOAD)
}, {
label: locale.translation('reloadPage'),
click: (item, focusedWindow) => {
if (focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_RELOAD)
}
}
},
CommonMenu.separatorMenuItem,
addBookmarkMenuItem('bookmarkPage', siteUtil.getDetailFromFrame(frame, siteTags.BOOKMARK), false), {
label: locale.translation('find'),
accelerator: 'CmdOrCtrl+F',
click: function (item, focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_SHOW_FINDBAR)
}
}, {
label: locale.translation('print'),
accelerator: 'CmdOrCtrl+P',
click: function (item, focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_PRINT)
}
}
},
CommonMenu.separatorMenuItem,
addBookmarkMenuItem('bookmarkPage', siteUtil.getDetailFromFrame(frame, siteTags.BOOKMARK), false), {
label: locale.translation('find'),
accelerator: 'CmdOrCtrl+F',
click: function (item, focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_SHOW_FINDBAR)
}
}, {
label: locale.translation('print'),
accelerator: 'CmdOrCtrl+P',
click: function (item, focusedWindow) {
focusedWindow.webContents.send(messages.SHORTCUT_ACTIVE_FRAME_PRINT)
}
}
// CommonMenu.separatorMenuItem
// TODO: bravery menu goes here
)
}
// CommonMenu.separatorMenuItem
// TODO: bravery menu goes here
)
}

template.push(CommonMenu.separatorMenuItem)
template.push(CommonMenu.separatorMenuItem)
}

if (!nodeProps.linkURL) {
if (!isLink && !isImage) {
template.push({
label: locale.translation('viewPageSource'),
click: (item, focusedWindow) => {
Expand Down