public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-17 19:51:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #43 from eschmid72/master

Browse Source 
including ace via npm, not as git submodule anymore
This commit is contained in:
Dick Choi
2016-06-06 10:41:00 +09:00
parent 187ccaa95e 36d81a6ec9
commit e931d3efbc
6 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -1,4 +0,0 @@
[submodule "submodules/ace"]
path = submodules/ace
url = https://github.com/ajaxorg/ace-builds.git
branch = master

2
gruntfile.js
View File

@@ -98,7 +98,7 @@ module.exports = function (grunt) {
prune: true, prune: true,
overwrite: true, overwrite: true,
out: path.join(__dirname, 'dist'), out: path.join(__dirname, 'dist'),
ignore: /submodules\/ace\/(?!src-min)|submodules\/ace\/(?=src-min-noconflict)|node_modules\/devicon\/icons|dist|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json|^\/node_modules\/grunt/ ignore: /node_modules\/ace-builds\/(?!src-min)|node_modules\/ace-builds\/(?=src-min-noconflict)|node_modules\/devicon\/icons|dist|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json|^\/node_modules\/grunt/
} }
switch (platform) { switch (platform) {
case 'win': case 'win':

2
lib/finder.html
View File

@@ -27,7 +27,7 @@
</head> </head>
<body> <body>
<div id="content"></div> <div id="content"></div>
<script src="../submodules/ace/src-min/ace.js"></script> <script src="../node_modules/ace-builds/src-min/ace.js"></script>
<script src="../resources/katex.min.js"></script> <script src="../resources/katex.min.js"></script>
<script> <script>
const electron = require('electron') const electron = require('electron')

4
lib/main.html
View File

@@ -55,8 +55,8 @@
<div id="content"></div> <div id="content"></div>
<script src="../submodules/ace/src-min/ace.js"></script> <script src="../node_modules/ace-builds/src-min/ace.js"></script>
<script src="../submodules/ace/src-min/ext-themelist.js"></script> <script src="../node_modules/ace-builds/src-min/ext-themelist.js"></script>
<script src="../resources/katex.min.js"></script> <script src="../resources/katex.min.js"></script>
<script type='text/javascript'> <script type='text/javascript'>
const electron = require('electron') const electron = require('electron')

4
package.json
View File

@@ -38,6 +38,7 @@
"@rokt33r/markdown-it-math": "^4.0.1", "@rokt33r/markdown-it-math": "^4.0.1",
"@rokt33r/node-ipc": "^5.0.4", "@rokt33r/node-ipc": "^5.0.4",
"@rokt33r/sanitize-html": "^1.11.2", "@rokt33r/sanitize-html": "^1.11.2",
"ace-builds": "git+https://git@github.com/ajaxorg/ace-builds.git",
"devicon": "^2.0.0", "devicon": "^2.0.0",
"electron-gh-releases": "^2.0.2", "electron-gh-releases": "^2.0.2",
"font-awesome": "^4.3.0", "font-awesome": "^4.3.0",
@@ -83,9 +84,6 @@
}, },
"optional": false, "optional": false,
"standard": { "standard": {
"ignore": [
"submodules"
],
"globals": [ "globals": [
"localStorage" "localStorage"
] ]

1
submodules/ace

Submodule submodules/ace deleted from 8dcfcd6d0d