phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Stop using dist directory to build

Browse Source
This commit is contained in:
Yuya Ochiai
2017-03-03 23:06:47 +09:00
parent 8376ffe4cc
commit ae1c079b95
8 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/browser/components/MattermostView.jsx
View File

@@ -1,6 +1,6 @@
const React = require('react');
const {findDOMNode} = require('react-dom');
const {ipcRenderer, shell} = require('electron');
const {ipcRenderer, remote, shell} = require('electron');
const fs = require('fs');
const url = require('url');
const osLocale = require('os-locale');
@@ -8,6 +8,8 @@ const electronContextMenu = require('electron-context-menu');
const ErrorView = require('./ErrorView.jsx');
const preloadJS = `file://${remote.app.getAppPath()}/browser/webview/mattermost_bundle.js`;
const MattermostView = React.createClass({
propTypes: {
disablewebsecurity: React.PropTypes.bool,
@@ -228,7 +230,7 @@ const MattermostView = React.createClass({
id={this.props.id}
className='mattermostView'
style={this.props.style}
preload='webview/mattermost.js'
preload={preloadJS}
src={this.props.src}
ref='webview'
nodeintegration='false'

4
src/browser/index.html
View File

@@ -3,13 +3,13 @@
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="modules/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="css/index.css">
</head>
<body>
<div id="content"></div>
<script src="index.js"></script>
<script src="index_bundle.js"></script>
</body>
</html>

4
src/browser/settings.html
View File

@@ -4,14 +4,14 @@
<head>
<meta charset="UTF-8">
<title>Settings</title>
<link rel="stylesheet" href="modules/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="css/index.css">
<link rel="stylesheet" href="css/settings.css">
</head>
<body>
<div id="content"></div>
<script src="settings.js"></script>
<script src="settings_bundle.js"></script>
</body>
</html>

2
src/package.json
View File

@@ -4,7 +4,7 @@
"desktopName": "Mattermost.desktop",
"version": "3.6.0",
"description": "Mattermost",
"main": "main.js",
"main": "main_bundle.js",
"author": {
"name": "Yuya Ochiai",
"email": "yuya0321@gmail.com"