Skip to content

Add explicit options icon #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2017
Merged

Add explicit options icon #5

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
1 change: 1 addition & 0 deletions icon-options.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 18 additions & 19 deletions popup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ input {
list-style: none;
}
.ext {
overflow: hidden;
text-overflow: ellipsis;
display: flex;
white-space: nowrap;
font-size: 1.2em;
line-height: 1.8;
Expand All @@ -68,28 +67,28 @@ input {
.ext.disabled + .disabled {
margin-top: 0;
}
.ext:hover {
background-color: #ecf0f1;
cursor: pointer;
}
.extIcon {
margin-right: 0.3em;
}
.extIcon a{
cursor: default;
.extName {
flex-grow: 1;
overflow: hidden;
text-overflow: ellipsis;
}
.extIcon img {
.ext img {
width: 16px;
height: 16px;
cursor: default;
vertical-align: -3px;
}
a .hasOpt {
overflow: hidden;
transition-duration: 0.8s;
transition-property: transform;
.extIcon {
margin-right: 0.3em;
}
.extOptions {
padding: 0 0.3em;
opacity: 0.1;
}
.ext > *:hover {
background-color: #ecf0f1;
cursor: pointer;
}
.hasOpt:hover {
transform: rotate(360deg);
*:hover + .extOptions,
.extOptions:hover {
opacity: 1;
}
39 changes: 18 additions & 21 deletions popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const getI18N = chrome.i18n.getMessage;
const searchText = $('#searchext');

// disable the default context menu
window.oncontextmenu = () => false;
eul.on('contextmenu', () => false);

searchText.attr('placeholder', getI18N('searchTxt')).focus();

Expand Down Expand Up @@ -56,9 +56,8 @@ cme.getAll(ets => {
$('#pbgjpgbpljobkekbhnnmlikbbfhbhmem').remove();
});

$('body').on('click', 'li.ext', function (e) {
const that = $(this);
const extSel = that.find('.extName');
$('body').on('click', '.extName', function (e) {
const extSel = $(this);
const eid = extSel.attr('data-id');
cme.get(eid, e => {
extSel.parent().remove();
Expand All @@ -72,17 +71,11 @@ $('body').on('click', 'li.ext', function (e) {
});
}
});
}).on('click', 'li .extIcon a', function (e) {
const that = $(this);
const href = that.attr('href');
if (href !== '#') {
chrome.tabs.create({url: href});
}
}).on('mouseup', 'li.ext', function (e) {
}).on('click', '.extOptions', e => {
chrome.tabs.create({url: e.target.href});
}).on('mouseup', '.extName', e => {
if (e.which == 3) {
const that = $(this);
const eid = that.find('.extName').attr('data-id');
cme.uninstall(eid);
cme.uninstall(e.target.dataset.id);
}
});

Expand Down Expand Up @@ -114,21 +107,25 @@ function getIcon(icons, size = 16) {
return false;
}
selectedIcon = icon.url;
})
});
}
return selectedIcon;
}

function createList(e, enabled) {
return `
<li class='ext ${enabled ? '' : 'disabled'}' id='${e.id}' data-name="${e.name.toLowerCase()}">
<span class='extIcon' title='${e.optionsUrl ? getI18N('openOpt') : ''}'>
<a href='${e.optionsUrl ? e.optionsUrl : ''}'><img
src='${getIcon(e.icons, 16)}'
class='${e.optionsUrl ? 'hasOpt' : ''}'
></a>
<span class='extName' data-id='${e.id}' title='${getI18N('toggleEnable')}'>
<img class='extIcon' src='${getIcon(e.icons, 16)}'>
${e.name}
</span>
<span class='extName' data-id='${e.id}' title='${getI18N('toggleEnable')}'>${e.name}</span>
${
e.optionsUrl ? `
<a class='extOptions' href='${e.optionsUrl}' title='${getI18N('openOpt')}'>
<img src="${chrome.extension.getURL('icon-options.svg')}">
</a>
` : ``
}
</li>
`;
}
Expand Down