Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit dc5085b

Browse files
rmisiormisio
authored
Merge pull request #1811 from OpenBazaar/UpdateElectron
Update Electron
2 parents 06a75e2 + 004757c commit dc5085b

File tree

12 files changed

+286
-305
lines changed

12 files changed

+286
-305
lines changed

‎.eslintrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dot-location": [2, "property"],
2020
"dot-notation": 0,
2121
"eqeqeq": 0,
22-
"indent": [1, 2, { "VariableDeclarator": { "var": 2, "let": 2, "const": 3 } }],
22+
"indent": [1, 2, { "VariableDeclarator": { "var": 2, "let": 2, "const": 3 }, "SwitchCase": 1 }],
2323
"guard-for-in": 2,
2424
"key-spacing": [1, {
2525
"singleLine": {

‎.jshintignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.jshintrc‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎js/App.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
'use strict';
1+
'use strict';
22

3-
var ipcRenderer = require('ipc-renderer'),
3+
var ipcRenderer = require('electron').ipcRenderer,
44
$ = require('jquery'),
55
Socket = require('./utils/Socket'),
66
_app;
77

8+
89
function App() {
910
var self = this;
1011

@@ -54,7 +55,7 @@ App.prototype.login = function() {
5455
password: activeServer.get('password')
5556
},
5657
timeout: 3000
57-
});
58+
});
5859
};
5960

6061
App.prototype.getGuid = function(handle, resolver) {

‎js/router.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var ipcRenderer = require('ipc-renderer'),
3+
var ipcRenderer = require('electron').ipcRenderer,
44
__ = require('underscore'),
55
Backbone = require('backbone'),
66
$ = require('jquery'),
@@ -284,10 +284,10 @@ module.exports = Backbone.Router.extend({
284284

285285
launchPageConnectModal: function(config) {
286286
var defaults = {
287-
connectText: 'Connecting...',
288-
failedText: 'Unable to Connect.'
289-
},
290-
deferred = $.Deferred();
287+
connectText: 'Connecting...',
288+
failedText: 'Unable to Connect.'
289+
},
290+
deferred = $.Deferred();
291291

292292
if (!(
293293
config &&

‎js/start.js‎

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ window.onblur = function() {
2626
};
2727

2828
var Polyglot = require('node-polyglot'),
29-
ipcRenderer = require('ipc-renderer'),
29+
ipcRenderer = require('electron').ipcRenderer,
3030
remote = require('electron').remote,
3131
getBTPrice = require('./utils/getBitcoinPrice'),
3232
router = require('./router'),
@@ -223,7 +223,7 @@ app.serverConfigs.on('activeServerChange', () => {
223223
var platform = process.platform;
224224

225225
if (platform === "linux") {
226-
var scaleFactor = require('screen').getPrimaryDisplay().scaleFactor;
226+
var scaleFactor = require('electron').screen.getPrimaryDisplay().scaleFactor;
227227
if (scaleFactor === 0) {
228228
scaleFactor = 1;
229229
}
@@ -274,8 +274,8 @@ $(document).on('mouseleave', 'a[data-href-tooltip]', function() {
274274

275275
//record changes to the app state
276276
$(window).bind('hashchange', function(){
277-
const host = encodeURIComponent(app.serverConfigs.getActive().getServerBaseUrl());
278-
const route = Backbone.history.getFragment();
277+
const host = encodeURIComponent(app.serverConfigs.getActive().getServerBaseUrl());
278+
const route = Backbone.history.getFragment();
279279
localStorage.setItem(host, route);
280280
});
281281

@@ -313,49 +313,49 @@ $(window).bind('keydown', function(e) {
313313

314314
if (ctrl) {
315315
switch (char) {
316-
case window.config.keyShortcuts.undo:
317-
e.preventDefault();
318-
//run undo programmatically to avoid crash
319-
document.execCommand('undo');
320-
break;
321-
case window.config.keyShortcuts.discover:
322-
route = 'home';
323-
break;
324-
case window.config.keyShortcuts.myPage:
325-
route = 'userPage';
326-
break;
327-
case window.config.keyShortcuts.customizePage:
328-
route = 'userPage/' + user.get('guid') + '/customize';
329-
break;
330-
case window.config.keyShortcuts.create:
331-
route = 'userPage/' + user.get('guid') + '/listingNew';
332-
break;
333-
case window.config.keyShortcuts.purchases:
334-
route = 'transactions/purchases';
335-
break;
336-
case window.config.keyShortcuts.sales:
337-
route = 'transactions/sales';
338-
break;
339-
case window.config.keyShortcuts.cases:
340-
route = 'transactions/cases';
341-
break;
342-
case window.config.keyShortcuts.settings:
343-
route = 'settings';
344-
break;
345-
case window.config.keyShortcuts.addressBar:
346-
// Select all text in address bar
347-
$('.js-navAddressBar').select();
348-
break;
349-
case window.config.keyShortcuts.save:
350-
window.obEventBus.trigger('saveCurrentForm');
351-
break;
352-
case window.config.keyShortcuts.refresh:
353-
e.preventDefault();
354-
app.router.refresh();
355-
break;
356-
case window.config.keyShortcuts.restart:
357-
location.reload();
358-
break;
316+
case window.config.keyShortcuts.undo:
317+
e.preventDefault();
318+
//run undo programmatically to avoid crash
319+
document.execCommand('undo');
320+
break;
321+
case window.config.keyShortcuts.discover:
322+
route = 'home';
323+
break;
324+
case window.config.keyShortcuts.myPage:
325+
route = 'userPage';
326+
break;
327+
case window.config.keyShortcuts.customizePage:
328+
route = 'userPage/' + user.get('guid') + '/customize';
329+
break;
330+
case window.config.keyShortcuts.create:
331+
route = 'userPage/' + user.get('guid') + '/listingNew';
332+
break;
333+
case window.config.keyShortcuts.purchases:
334+
route = 'transactions/purchases';
335+
break;
336+
case window.config.keyShortcuts.sales:
337+
route = 'transactions/sales';
338+
break;
339+
case window.config.keyShortcuts.cases:
340+
route = 'transactions/cases';
341+
break;
342+
case window.config.keyShortcuts.settings:
343+
route = 'settings';
344+
break;
345+
case window.config.keyShortcuts.addressBar:
346+
// Select all text in address bar
347+
$('.js-navAddressBar').select();
348+
break;
349+
case window.config.keyShortcuts.save:
350+
window.obEventBus.trigger('saveCurrentForm');
351+
break;
352+
case window.config.keyShortcuts.refresh:
353+
e.preventDefault();
354+
app.router.refresh();
355+
break;
356+
case window.config.keyShortcuts.restart:
357+
location.reload();
358+
break;
359359
}
360360

361361
if (route !== null) {
@@ -423,7 +423,7 @@ var loadProfile = function(landingRoute, onboarded) {
423423
var userLang = model.get('language');
424424
cCode = model.get('currency_code');
425425

426-
if(userLang != window.polyglot.currentLocale){
426+
if (userLang != window.polyglot.currentLocale){
427427
//when switching nodes, the language saved in localStorage can be different than the language in the
428428
// user model, but the user model does not trigger a change because it hasn't changed
429429
updatePolyglot(userLang);
@@ -658,64 +658,64 @@ removeStartupRetry = function() {
658658
app.getHeartbeatSocket().on('message', function(e) {
659659
if (e.jsonData && e.jsonData.status) {
660660
switch (e.jsonData.status) {
661-
case 'generating GUID':
662-
profileLoaded && location.reload();
663-
if (guidCreating) return;
664-
665-
// todo: put in some timeout in the off chance the guid
666-
// creation process doesn't complete after a long time.
667-
guidCreating = $.Deferred();
668-
669-
// launch onboarding, pass in guid creating
670-
launchOnboarding(guidCreating);
671-
break;
672-
case 'GUID generation complete':
673-
profileLoaded && location.reload();
674-
675-
app.serverConfigs.getActive().save({
676-
username: e.jsonData.username,
677-
password: e.jsonData.password
678-
});
679-
680-
app.login().done(function() {
681-
guidCreating.resolve();
682-
});
661+
case 'generating GUID':
662+
profileLoaded && location.reload();
663+
if (guidCreating) return;
664+
665+
// todo: put in some timeout in the off chance the guid
666+
// creation process doesn't complete after a long time.
667+
guidCreating = $.Deferred();
668+
669+
// launch onboarding, pass in guid creating
670+
launchOnboarding(guidCreating);
671+
break;
672+
case 'GUID generation complete':
673+
profileLoaded && location.reload();
674+
675+
app.serverConfigs.getActive().save({
676+
username: e.jsonData.username,
677+
password: e.jsonData.password
678+
});
683679

684-
break;
685-
case 'online':
686-
if (loadProfileNeeded && !guidCreating) {
687-
loadProfileNeeded = false;
688-
onboardingModal && onboardingModal.remove();
689-
690-
app.login().done(function(data) {
691-
if (data.success) {
692-
$.getJSON(app.serverConfigs.getActive().getServerBaseUrl() + '/profile')
693-
.done(function(profile, textStatus) {
694-
if (textStatus == 'parsererror') {
695-
alert(window.polyglot.t('errorMessages.serverError') +"\n\n"+ window.polyglot.t('errorMessages.badJSON'));
696-
app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
697-
.open();
698-
return;
699-
}
700-
701-
if (__.isEmpty(profile)) {
702-
launchOnboarding(guidCreating = $.Deferred().resolve().promise());
703-
} else {
704-
app.serverConnectModal.succeedConnection(app.serverConfigs.getActive());
705-
loadProfile();
706-
}
707-
});
708-
} else {
709-
app.serverConnectModal.failConnection(
710-
data.reason === 'too many attempts' ? 'failed-auth-too-many' : 'failed-auth',
711-
app.serverConfigs.getActive()
712-
).open();
713-
}
714-
}).fail(function() {
715-
app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
716-
.open();
680+
app.login().done(function() {
681+
guidCreating.resolve();
717682
});
718-
}
683+
684+
break;
685+
case 'online':
686+
if (loadProfileNeeded && !guidCreating) {
687+
loadProfileNeeded = false;
688+
onboardingModal && onboardingModal.remove();
689+
690+
app.login().done(function(data) {
691+
if (data.success) {
692+
$.getJSON(app.serverConfigs.getActive().getServerBaseUrl() + '/profile')
693+
.done(function(profile, textStatus) {
694+
if (textStatus == 'parsererror') {
695+
alert(window.polyglot.t('errorMessages.serverError') +"\n\n"+ window.polyglot.t('errorMessages.badJSON'));
696+
app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
697+
.open();
698+
return;
699+
}
700+
701+
if (__.isEmpty(profile)) {
702+
launchOnboarding(guidCreating = $.Deferred().resolve().promise());
703+
} else {
704+
app.serverConnectModal.succeedConnection(app.serverConfigs.getActive());
705+
loadProfile();
706+
}
707+
});
708+
} else {
709+
app.serverConnectModal.failConnection(
710+
data.reason === 'too many attempts' ? 'failed-auth-too-many' : 'failed-auth',
711+
app.serverConfigs.getActive()
712+
).open();
713+
}
714+
}).fail(function() {
715+
app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
716+
.open();
717+
});
718+
}
719719
}
720720
}
721721
if (e.jsonData && e.jsonData.libbitcoin) {

‎js/views/adminPanelVw.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var __ = require('underscore'),
44
Backbone = require('backbone'),
55
$ = require('jquery'),
66
loadTemplate = require('../utils/loadTemplate'),
7-
remote = require('remote'),
7+
remote = require('electron').remote,
88
userSettingsModel = require('../models/userMd'),
99
userProfileModel = require('../models/userProfileMd');
1010

@@ -26,7 +26,6 @@ module.exports = Backbone.View.extend({
2626
},
2727

2828
initialize: function () {
29-
this.avatarHash = "";
3029
this.serverUrl = this.model.get('serverUrl');
3130
this.userSettings = new userSettingsModel();
3231
this.userProfile = new userProfileModel();
@@ -226,4 +225,4 @@ module.exports = Backbone.View.extend({
226225
this.unbind();
227226
this.remove();
228227
}
229-
});
228+
});

‎js/views/buyWizardVw.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var __ = require('underscore'),
1111
chosen = require('../utils/chosen.jquery.min.js'),
1212
qr = require('qr-encode'),
1313
app = require('../App').getApp(),
14-
clipboard = require('clipboard'),
14+
clipboard = require('electron').clipboard,
1515
templateHelpers = require('../utils/templateHelpers');
1616

1717
module.exports = baseModal.extend({

0 commit comments

Comments
 (0)