Skip to content

Commit 00b7a54

Browse files
author
Doug Tedd
committed
Conflicts: src/browser/app_controller_mac.mm
2 parents 65b8e86 + 2fc97ad commit 00b7a54

File tree

626 files changed

+36949
-3559
lines changed

Some content is hidden

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

626 files changed

+36949
-3559
lines changed

AUTHORS

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,17 @@ Michael Morrison <mmorrison@wootalyzer.com>
2020
William Towe <willbur1984@gmail.com>
2121
Toni Lähdekorpi <toni@lygon.net>
2222
Youngwook Kim <youngwook.kim@gmail.com>
23-
Zhang Zeyi (richardcypher) <sjturichardcypher@gmail.com>
23+
Zhao Zeyi (richardcypher) <sjturichardcypher@gmail.com>
24+
Fabrice Weinberg <fabrice@weinberg.me>
25+
Lv Kaiyang <kevinlui598@gmail.com>
26+
Lukas Benes <bender@false.cz>
27+
Lithare Emileit <litharemilit@gmail.com>
28+
Jefry Tedjokusumo <jtg_gg@yahoo.com.sg>
29+
Wu Haojian <hokein.wu@gmail.com>
30+
Bas Wegh <BasWegh@gmx.de>
31+
Joachim Bauch <mail@joachim-bauch.de>
32+
Cong Liu <leehom2001@gmail.com>
33+
Eric Newport <kethinov@gmail.com>
34+
Marco Fabbri <mrfabbri@gmail.com>
35+
Daniel Braun <danielbraun@me.com>
36+
Chase Willden <chase.willden@gmail.com>

CHANGELOG.md

Lines changed: 352 additions & 0 deletions
Large diffs are not rendered by default.

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Copyright (c) 2012 Intel Corp
2-
Copyright (c) 2012 The Chromium Authors
1+
Copyright (c) 2012-2014 Intel Corp
2+
Copyright (c) 2012-2014 The Chromium Authors
33

44
Permission is hereby granted, free of charge, to any person obtaining a copy of
55
this software and associated documentation files (the "Software"), to deal in th

README.md

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
11
## Introduction
22

33
node-webkit is an app runtime based on `Chromium` and `node.js`. You can
4-
write native apps in HTML and Javascript with node-webkit. It also lets you
4+
write native apps in HTML and JavaScript with node-webkit. It also lets you
55
call Node.js modules directly from the DOM and enables a new way of writing
66
native applications with all Web technologies.
77

88
It's created and developed in the Intel Open Source Technology Center.
99

1010
[Introduction to node-webkit (slides)](https://speakerdeck.com/u/zcbenz/p/node-webkit-app-runtime-based-on-chromium-and-node-dot-js)
1111
[Creating Desktop Applications With node-webkit](http://strongloop.com/strongblog/creating-desktop-applications-with-node-webkit/)
12-
[WebApp to DesktopApp with node-webkit (slides)](http://oldgeeksguide.github.io/presentations/html5devconf2013/wtod.html)
12+
[WebApp to DesktopApp with node-webkit (slides)](http://oldgeeksguide.github.io/presentations/html5devconf2013/wtod.html)
13+
[Essay on the history and internals of the project](http://yedingding.com/2014/08/01/node-webkit-intro-en.html)
1314

1415
## Features
1516

1617
* Apps written in modern HTML5, CSS3, JS and WebGL.
1718
* Complete support for [Node.js APIs](http://nodejs.org/api/) and all its [third party modules](https://npmjs.org).
1819
* Good performance: Node and WebKit runs in the same thread: Function calls are made straightforward; objects are in the same heap and can just reference each other;
1920
* Easy to package and distribute apps.
20-
* Available on Linux, Mac OSX and Windows
21+
* Available on Linux, Mac OS X and Windows
2122

2223
## Downloads
23-
[v0.9.2 release notes](https://groups.google.com/d/msg/node-webkit/qpBhcWr-hSc/caGjhtl8cEgJ)
24+
* **v0.11.2:** (Nov 26, 2014, based off of Node v0.11.13, Chromium 38.0.2125.104): [release notes](https://groups.google.com/d/msg/node-webkit/hpG-AgsATTI/Oc-qhC3rMnkJ)
2425

25-
Prebuilt binaries (v0.9.2 - Feb 20, 2014):
26+
* Linux: [32bit](http://dl.node-webkit.org/v0.11.2/node-webkit-v0.11.2-linux-ia32.tar.gz) / [64bit](http://dl.node-webkit.org/v0.11.2/node-webkit-v0.11.2-linux-x64.tar.gz)
27+
* Windows: [32bit](http://dl.node-webkit.org/v0.11.2/node-webkit-v0.11.2-win-ia32.zip) / [64bit](http://dl.node-webkit.org/v0.11.2/node-webkit-v0.11.2-win-x64.zip)
28+
* Mac 10.7+: [32bit](http://dl.node-webkit.org/v0.11.2/node-webkit-v0.11.2-osx-ia32.zip) / [64bit](http://dl.node-webkit.org/v0.11.2/node-webkit-v0.11.2-osx-x64.zip)
2629

27-
* Linux: [32bit](https://s3.amazonaws.com/node-webkit/v0.9.2/node-webkit-v0.9.2-linux-ia32.tar.gz) / [64bit] (https://s3.amazonaws.com/node-webkit/v0.9.2/node-webkit-v0.9.2-linux-x64.tar.gz)
28-
* Windows: [win32](https://s3.amazonaws.com/node-webkit/v0.9.2/node-webkit-v0.9.2-win-ia32.zip)
29-
* Mac: [32bit, 10.7+](https://s3.amazonaws.com/node-webkit/v0.9.2/node-webkit-v0.9.2-osx-ia32.zip)
30+
* **0.8.6:** (Apr 18, 2014, based off of Node v0.10.22, Chrome 30.0.1599.66) **If your native Node module works only with Node v0.10, then you should use node-webkit v0.8.x, which is also a maintained branch. [More info](https://groups.google.com/d/msg/node-webkit/2OJ1cEMPLlA/09BvpTagSA0J)**
31+
[release notes](https://groups.google.com/d/msg/node-webkit/CLPkgfV-i7s/hwkkQuJ1kngJ)
3032

31-
**If your native Node module works only with Node v0.10, then you should use node-webkit v0.8.x, which is also a maintained branch. [More info](https://groups.google.com/d/msg/node-webkit/2OJ1cEMPLlA/09BvpTagSA0J)**
32-
[v0.8.4 release notes](https://groups.google.com/d/msg/node-webkit/bPjur7aFaQc/4TP6o3SM-8sJ)
33+
* Linux: [32bit](http://dl.node-webkit.org/v0.8.6/node-webkit-v0.8.6-linux-ia32.tar.gz) / [64bit](http://dl.node-webkit.org/v0.8.6/node-webkit-v0.8.6-linux-x64.tar.gz)
34+
* Windows: [win32](http://dl.node-webkit.org/v0.8.6/node-webkit-v0.8.6-win-ia32.zip)
35+
* Mac: [32bit, 10.7+](http://dl.node-webkit.org/v0.8.6/node-webkit-v0.8.6-osx-ia32.zip)
3336

34-
Prebuilt binaries (v0.8.4 - Dec 30, 2013):
37+
* **latest live build**: git tip version; build triggered from every git commit: http://dl.node-webkit.org/live-build/
3538

36-
* Linux: [32bit](https://s3.amazonaws.com/node-webkit/v0.8.4/node-webkit-v0.8.4-linux-ia32.tar.gz) / [64bit] (https://s3.amazonaws.com/node-webkit/v0.8.4/node-webkit-v0.8.4-linux-x64.tar.gz)
37-
* Windows: [win32](https://s3.amazonaws.com/node-webkit/v0.8.4/node-webkit-v0.8.4-win-ia32.zip)
38-
* Mac: [32bit, 10.7+](https://s3.amazonaws.com/node-webkit/v0.8.4/node-webkit-v0.8.4-osx-ia32.zip)
39-
40-
[Looking for older versions?](https://github.com/rogerwang/node-webkit/wiki/Downloads-of-old-versions)
39+
* [Previous versions](https://github.com/rogerwang/node-webkit/wiki/Downloads-of-old-versions)
4140

4241
###Demos and real apps
4342
You may also be interested in [our demos repository](https://github.com/zcbenz/nw-sample-apps) and the [List of apps and companies using node-webkit](https://github.com/rogerwang/node-webkit/wiki/List-of-apps-and-companies-using-node-webkit).
@@ -68,29 +67,17 @@ Create `package.json`:
6867
}
6968
```
7069

71-
Compress `index.html` and `package.json` into a zip archive called `app.nw`:
72-
73-
````bash
74-
$ zip app.nw index.html package.json
75-
````
76-
77-
This should create a structure like this:
78-
79-
```
80-
app.nw
81-
|-- package.json
82-
`-- index.html
70+
Run:
71+
```bash
72+
$ /path/to/nw . (suppose the current directory contains 'package.json')
8373
```
8474

85-
Download the prebuilt binary for your platform and use it to open the
86-
`app.nw` file:
87-
88-
````bash
89-
$ ./nw app.nw
90-
````
91-
92-
Note: on Windows, you can drag the `app.nw` to `nw.exe` to open it.
75+
Note: on Windows, you can drag the folder containing `package.json` to `nw.exe` to open it.
9376

77+
Note: on OSX, the executable binary is in a hidden directory within the .app file. To run node-webkit on OSX, type:
78+
```bash
79+
$ /path/to/node-webkit.app/Contents/MacOS/node-webkit . (suppose the current directory contains 'package.json')
80+
```
9481
## Documents
9582

9683
For more information on how to write/package/run apps, see:
@@ -112,3 +99,10 @@ You can chat with us on IRC in the ##node-webkit channel on irc.freenode.net
11299
## License
113100

114101
`node-webkit`'s code in this repo uses the MIT license, see our `LICENSE` file. To redistribute the binary, see [How to package and distribute your apps](https://github.com/rogerwang/node-webkit/wiki/How-to-package-and-distribute-your-apps)
102+
103+
## Sponsors
104+
105+
The work is being sponsored by:
106+
* [Intel](http://www.intel.com)
107+
* [Gnor Tech](http://gnor.net)
108+
* [eFounders](http://efounders.co)

0 commit comments

Comments
 (0)