Skip to content

Commit 4d5fe4a

Browse files
committed
fix build
1 parent af1505e commit 4d5fe4a

File tree

3 files changed

+30
-15
lines changed

3 files changed

+30
-15
lines changed

src/components/Popup/EntryComponent.vue

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,14 +302,16 @@ function getQrUrl(entry: OTPEntry) {
302302
}
303303
304304
function insertContentScript() {
305-
return new Promise((resolve: () => void, reject: (reason: Error) => void) => {
306-
try {
307-
return chrome.tabs.executeScript({ file: "/dist/content.js" }, () => {
308-
chrome.tabs.insertCSS({ file: "/css/content.css" }, resolve);
309-
});
310-
} catch (error) {
311-
return reject(error as Error);
305+
return new Promise<void>(
306+
(resolve: () => void, reject: (reason: Error) => void) => {
307+
try {
308+
return chrome.tabs.executeScript({ file: "/dist/content.js" }, () => {
309+
chrome.tabs.insertCSS({ file: "/css/content.css" }, resolve);
310+
});
311+
} catch (error) {
312+
return reject(error as Error);
313+
}
312314
}
313-
});
315+
);
314316
}
315317
</script>

src/components/Popup/MenuPage.vue

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
</a>
2323
</div>
2424
<div class="menuList">
25-
<p v-bind:title="i18n.backup" v-on:click="showInfo('BackupPage')">
25+
<p
26+
v-bind:title="i18n.backup"
27+
v-on:click="showInfo('BackupPage')"
28+
v-if="isSupported"
29+
>
2630
<span><IconExchange /></span>{{ i18n.backup }}
2731
</p>
2832
<p
@@ -31,7 +35,11 @@
3135
>
3236
<span><IconLock /></span>{{ i18n.security }}
3337
</p>
34-
<p v-bind:title="i18n.sync_clock" v-on:click="syncClock()">
38+
<p
39+
v-bind:title="i18n.sync_clock"
40+
v-on:click="syncClock()"
41+
v-if="isSupported"
42+
>
3543
<span><IconSync /></span>{{ i18n.sync_clock }}
3644
</p>
3745
<p
@@ -83,7 +91,7 @@ import IconComments from "../../../svg/comments.svg";
8391
import IconGlobe from "../../../svg/globe.svg";
8492
import IconCode from "../../../svg/code.svg";
8593
import IconClipboardCheck from "../../../svg/clipboard-check.svg";
86-
import { isFirefox } from "../../browser";
94+
import { isFirefox, isSafari } from "../../browser";
8795
8896
export default Vue.extend({
8997
components: {
@@ -104,6 +112,11 @@ export default Vue.extend({
104112
version: function () {
105113
return this.$store.state.menu.version;
106114
},
115+
isSupported: {
116+
get(): boolean {
117+
return !isSafari;
118+
},
119+
},
107120
},
108121
methods: {
109122
hideMenu() {

src/components/Popup/PreferencesPage.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
:label="i18n.enable_context_menu"
4141
v-model="enableContextMenu"
4242
@change="requireContextMenuPermission()"
43-
v-if="!isFirefox"
43+
v-if="isSupported"
4444
/>
4545
<div class="control-group" v-show="encryption.getEncryptionStatus()">
4646
<label class="combo-label">{{ i18n.autolock }}</label>
@@ -61,7 +61,7 @@
6161
</template>
6262
<script lang="ts">
6363
import Vue from "vue";
64-
import { isFirefox } from "../../browser";
64+
import { isFirefox, isSafari } from "../../browser";
6565
6666
export default Vue.extend({
6767
computed: {
@@ -135,9 +135,9 @@ export default Vue.extend({
135135
this.newStorageLocation = value ? "sync" : "local";
136136
},
137137
},
138-
isFirefox: {
138+
isSupported: {
139139
get(): boolean {
140-
return isFirefox;
140+
return !isFirefox && !isSafari;
141141
},
142142
},
143143
},

0 commit comments

Comments
 (0)