paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-10-29 11:03:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the way utils load.

Browse Source
This commit is contained in:
Zhongyi Tong
2017-06-16 23:09:07 +08:00
parent 7192dc69f6
commit f548a0ae53
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/renderer/js/components/webview.js
View File

@@ -23,9 +23,6 @@ class WebView extends BaseComponent {
this.zoomFactor = 1.0;
this.loading = false;
this.isActive = isActive;
this.domainUtil = new DomainUtil();
this.systemUtil = new SystemUtil();
this.linkUtil = new LinkUtil();
this.badgeCount = 0;
}
@@ -51,9 +48,9 @@ class WebView extends BaseComponent {
registerListeners() {
this.$el.addEventListener('new-window', event => {
const {url} = event;
const domainPrefix = this.domainUtil.getDomain(this.index).url;
const domainPrefix = DomainUtil.getDomain(this.index).url;
if (this.linkUtil.isInternal(domainPrefix, url)) {
if (LinkUtil.isInternal(domainPrefix, url)) {
event.preventDefault();
this.$el.loadURL(url);
} else {
@@ -72,7 +69,7 @@ class WebView extends BaseComponent {
this.$el.addEventListener('did-fail-load', event => {
const {errorDescription} = event;
const hasConnectivityErr = (this.systemUtil.connectivityERR.indexOf(errorDescription) >= 0);
const hasConnectivityErr = (SystemUtil.connectivityERR.indexOf(errorDescription) >= 0);
if (hasConnectivityErr) {
console.error('error', errorDescription);
this.checkConnectivity();
@@ -80,10 +77,10 @@ class WebView extends BaseComponent {
});
this.$el.addEventListener('did-start-loading', () => {
let userAgent = this.systemUtil.getUserAgent();
let userAgent = SystemUtil.getUserAgent();
if (!userAgent) {
this.systemUtil.setUserAgent(this.$el.getUserAgent());
userAgent = this.systemUtil.getUserAgent();
SystemUtil.setUserAgent(this.$el.getUserAgent());
userAgent = SystemUtil.getUserAgent();
}
this.$el.setUserAgent(userAgent);
});