Skip to content

Commit 979dcea

Browse files
committed
before applying redux
1 parent 116ddf3 commit 979dcea

86 files changed

Lines changed: 5436 additions & 2314 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ electron_build/
44
.env
55
dist/
66
vendor/
7+
Boost-darwin-x64/

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "submodules/ace"]
2+
path = submodules/ace
3+
url = https://github.com/ajaxorg/ace-builds.git
4+
branch = master

app.icns

155 KB
Binary file not shown.

browser/finder/Components/FinderDetail.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var React = require('react/addons')
1+
var React = require('react')
22

33
var CodeViewer = require('../../main/Components/CodeViewer')
44

browser/finder/Components/FinderInput.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var React = require('react/addons')
1+
var React = require('react')
22

33
module.exports = React.createClass({
44
propTypes: {

browser/finder/Components/FinderList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var React = require('react/addons')
1+
var React = require('react')
22

33
module.exports = React.createClass({
44
propTypes: {

browser/finder/index.electron.html

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

browser/finder/index.html

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
5+
<title>CodeXen Popup</title>
6+
<meta charset="utf-8">
7+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>
8+
9+
<link rel="stylesheet" href="../../node_modules/font-awesome/css/font-awesome.min.css" media="screen" title="no title" charset="utf-8">
10+
<link rel="shortcut icon" href="favicon.ico">
11+
<style>
12+
@font-face {
13+
font-family: 'Lato';
14+
src: url('../../resources/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */
15+
url('../../resources/Lato-Regular.woff') format('woff'), /* Modern Browsers */
16+
url('../../resources/Lato-Regular.ttf') format('truetype');
17+
font-style: normal;
18+
font-weight: normal;
19+
text-rendering: optimizeLegibility;
20+
}
21+
</style>
22+
<script>
23+
document.addEventListener('mousewheel', function(e) {
24+
if(e.deltaY % 1 !== 0) {
25+
e.preventDefault()
26+
}
27+
})
28+
</script>
29+
</head>
30+
<body>
31+
<div id="content"></div>
32+
<script src="../ace/src-min/ace.js"></script>
33+
<script>
34+
35+
require("babel-core/register")
36+
require('./index.jsx')
37+
</script>
38+
</body>
39+
</html>

browser/finder/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var remote = require('remote')
33
var hideFinder = remote.getGlobal('hideFinder')
44
var clipboard = require('clipboard')
55

6-
var React = require('react/addons')
6+
var React = require('react')
77

88
var ArticleFilter = require('../main/Mixins/ArticleFilter')
99

browser/index.html

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

0 commit comments

Comments
 (0)