Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
mbnuqw committed Sep 19, 2019
2 parents ff39884 + bba6eb8 commit ec42115
Show file tree
Hide file tree
Showing 32 changed files with 491 additions and 951 deletions.
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"sourceType": "module"
},
"rules": {
"no-console": 2,
"indent": ["error", 2],
"linebreak-style": ["error", "unix"],
"quotes": ["error", "single"],
Expand Down
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Bug report
about: Something is not working
---

## Description


## Steps to reproduce


## Expected behavior


## Actual behavior


## Environment info
<!-- Tip: You can find this info at the bottom of the settings page. -->
OS:
Firefox:
Addon:

<details><code>
<!-- To get details:
- Go to the settings page - section "Help"
- Click on the "Debug info" button
- Copy and paste here
Note: all URLs and titles are skipped. -->
</code></details>
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/Feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Feature request
about: Something is missing
---

## Description


## Use cases

2 changes: 1 addition & 1 deletion addon/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"author": "mbnuqw",
"name": "__MSG_ExtName__",
"version": "3.0.6",
"version": "3.0.7",
"default_locale": "en",
"description": "__MSG_ExtDesc__",
"homepage_url": "https://github.com/mbnuqw/sidebery",
Expand Down
4 changes: 0 additions & 4 deletions addon/settings/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@
class="option"
:data-active="$store.state.activeView === 'Snapshots'"
@click="navigateTo('snapshots')">{{t('settings.nav_snapshots')}}</div>
<div
class="option"
:data-active="$store.state.activeView === 'Debug'"
@click="navigateTo('debug')">{{t('settings.nav_debug')}}</div>
</nav>

<transition name="settings">
Expand Down
118 changes: 0 additions & 118 deletions build/debug.js

This file was deleted.

141 changes: 0 additions & 141 deletions build/release.js

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sidebery",
"version": "3.0.6",
"version": "3.0.7",
"description": "Manage your tabs and bookmarks in sidebar",
"main": "index.js",
"scripts": {
Expand Down
14 changes: 11 additions & 3 deletions src/components/select-field.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<template lang="pug">
.SelectField(:data-inline="inline" :data-inactive="inactive" @mousedown="select")
.SelectField(
:data-inline="inline"
:data-inactive="inactive"
@mousedown="switchOption")
.label {{t(label)}}
select-input(
:label="optLabel"
:value="value"
:opts="opts"
:noneOpt="noneOpt")
:noneOpt="noneOpt"
@input="select")
</template>


Expand All @@ -32,7 +36,7 @@ export default {
},
methods: {
select(e) {
switchOption(e) {
if (this.inactive) return
let i = this.opts.indexOf(this.value)
if (e.button === 0) i++
Expand All @@ -41,6 +45,10 @@ export default {
if (i < 0) i = this.opts.length - 1
this.$emit('input', this.opts[i])
},
select(option) {
this.$emit('input', option)
},
},
}
</script>
Loading

0 comments on commit ec42115

Please sign in to comment.