From e381a89cd5c2d940ddfcbee45d4f998c38c865e7 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Tue, 22 Dec 2015 23:35:22 +0900 Subject: [PATCH] Adapt to rearranged directories --- gulpfile.js | 4 ++-- src/browser/index.html | 8 ++++---- src/browser/index.js | 5 +++-- src/browser/settings.html | 8 ++++---- src/browser/settings.jsx | 2 +- src/browser/webview/mattermost.js | 2 +- src/main.js | 2 +- src/menus/app.js | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index a4ee1ad2..996fc7d4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -47,14 +47,14 @@ gulp.task('prettify:jsx', function() { gulp.task('build', ['build:jsx']); gulp.task('build:jsx', function() { - return gulp.src(['src/**/*.jsx', '!src/node_modules/**']) + return gulp.src(['src/browser/**/*.jsx', '!src/node_modules/**']) .pipe(changed(app_root, { extension: '.js' })) .pipe(babel({ presets: ['react'] })) - .pipe(gulp.dest(app_root + '/build')); + .pipe(gulp.dest('src/browser/build')); }); gulp.task('serve', function() { diff --git a/src/browser/index.html b/src/browser/index.html index 86107dec..f231c32f 100644 --- a/src/browser/index.html +++ b/src/browser/index.html @@ -4,10 +4,10 @@ electron-mattermost - - - - + + + + diff --git a/src/browser/index.js b/src/browser/index.js index c6660c82..2f76ab52 100644 --- a/src/browser/index.js +++ b/src/browser/index.js @@ -4,11 +4,12 @@ const electron = require('electron'); const remote = electron.remote; const osLocale = require('os-locale'); const fs = require('fs'); +const path = require('path'); var url = require('url'); var contextMenu = require('./menus/context'); -const settings = require('./common/settings'); +const settings = require('../common/settings'); var webView = document.getElementById('mainWebview'); @@ -89,7 +90,7 @@ var showUnreadBadge = function(unreadCount) { case 'win32': var window = remote.getCurrentWindow(); if (unreadCount > 0) { - window.setOverlayIcon(__dirname + '/resources/badge.png', 'You have unread channels.'); + window.setOverlayIcon(path.join(__dirname, '../resources/badge.png'), 'You have unread channels.'); } else { window.setOverlayIcon(null, ''); diff --git a/src/browser/settings.html b/src/browser/settings.html index c8cf1fc6..f3b11678 100644 --- a/src/browser/settings.html +++ b/src/browser/settings.html @@ -4,10 +4,10 @@ Settings - - - - + + + + diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx index d85ad59b..32a21460 100644 --- a/src/browser/settings.jsx +++ b/src/browser/settings.jsx @@ -1,7 +1,7 @@ 'use strict'; const remote = require('electron').remote; -const settings = require('./common/settings'); +const settings = require('../common/settings'); const Grid = ReactBootstrap.Grid; const Row = ReactBootstrap.Row; diff --git a/src/browser/webview/mattermost.js b/src/browser/webview/mattermost.js index 35caee7a..d8c83986 100644 --- a/src/browser/webview/mattermost.js +++ b/src/browser/webview/mattermost.js @@ -15,7 +15,7 @@ function isLowerThanOrEqualWindows8_1() { if (process.platform != 'win32') { return false; } - var osVersion = require('../common/osVersion'); + var osVersion = require('../../common/osVersion'); return (osVersion.major <= 6 && osVersion.minor <= 3); }; diff --git a/src/main.js b/src/main.js index bce6eb52..f76dfa5f 100644 --- a/src/main.js +++ b/src/main.js @@ -100,7 +100,7 @@ app.on('ready', function() { mainWindow = new BrowserWindow(window_options); // and load the index.html of the app. - mainWindow.loadURL('file://' + __dirname + '/index.html'); + mainWindow.loadURL('file://' + __dirname + '/browser/index.html'); // Open the DevTools. // mainWindow.openDevTools(); diff --git a/src/menus/app.js b/src/menus/app.js index dacc903e..ceb4befb 100644 --- a/src/menus/app.js +++ b/src/menus/app.js @@ -15,7 +15,7 @@ var createTemplate = function(mainWindow) { }, { label: 'Settings', click: function(item, focusedWindow) { - mainWindow.loadURL('file://' + __dirname + '/../settings.html'); + mainWindow.loadURL('file://' + __dirname + '/../browser/settings.html'); } }, { label: 'Quit',