Skip to content

Commit c771c66

Browse files
committed
Merge branch 'nw27' into nw28
2 parents 9aef97f + ff9b366 commit c771c66

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
0.27.4 / 01-05-2017
1+
0.27.5 / 01-15-2018
2+
===================
3+
- Fix: regression: webview devtools can no longer be embedded [(#6374)](https://github.com/nwjs/nw.js/issues/6374)
4+
- Fix: regression: devtools extension in embedded webview [(#6004)](https://github.com/nwjs/nw.js/issues/6004)
5+
- Fix: crash in node::PromiseHook when using Promise and johnny-five [(#6379)](https://github.com/nwjs/nw.js/issues/6379)
6+
- Fix: nwjs crash when choosing inspect when devtools are embedded [(#6375)](https://github.com/nwjs/nw.js/issues/6375)
7+
8+
0.27.4 / 01-05-2018
29
===================
310
- Update Chromium to [63.0.3239.132](https://chromereleases.googleblog.com/2018/01/stable-channel-update-for-desktop.html)
411
- Fix: Kiosk Mode does not lock app in macOS 10.12+ [(#6169)](https://github.com/nwjs/nw.js/issues/6169)

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ It was created in the Intel Open Source Technology Center.
2626
* Available on Linux, Mac OS X and Windows.
2727

2828
## Downloads
29-
* **v0.27.4:** (Jan 8, 2018, based off of Node.js v9.3.0, Chromium 63.0.3239.132): [release notes](https://nwjs.io/blog/v0.27.4/)
29+
* **v0.27.5:** (Jan 15, 2018, based off of Node.js v9.3.0, Chromium 63.0.3239.132): [release notes](https://nwjs.io/blog/v0.27.5/)
3030
**NOTE** You might want the **SDK build**. Please read the release notes.
31-
* Linux: [32bit](https://dl.nwjs.io/v0.27.4/nwjs-v0.27.4-linux-ia32.tar.gz) / [64bit](https://dl.nwjs.io/v0.27.4/nwjs-v0.27.4-linux-x64.tar.gz)
32-
* Windows: [32bit](https://dl.nwjs.io/v0.27.4/nwjs-v0.27.4-win-ia32.zip) / [64bit](https://dl.nwjs.io/v0.27.4/nwjs-v0.27.4-win-x64.zip)
33-
* Mac 10.9+: [64bit](https://dl.nwjs.io/v0.27.4/nwjs-v0.27.4-osx-x64.zip)
31+
* Linux: [32bit](https://dl.nwjs.io/v0.27.5/nwjs-v0.27.5-linux-ia32.tar.gz) / [64bit](https://dl.nwjs.io/v0.27.5/nwjs-v0.27.5-linux-x64.tar.gz)
32+
* Windows: [32bit](https://dl.nwjs.io/v0.27.5/nwjs-v0.27.5-win-ia32.zip) / [64bit](https://dl.nwjs.io/v0.27.5/nwjs-v0.27.5-win-x64.zip)
33+
* Mac 10.9+: [64bit](https://dl.nwjs.io/v0.27.5/nwjs-v0.27.5-osx-x64.zip)
3434
* Use [Legacy build](http://nwjs.io/downloads/) for Win XP and early OSX.
3535

3636
* **latest nightly build from git tip**: https://dl.nwjs.io/live-build/

docs/For Users/Advanced/JavaScript Contexts in NW.js.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Different windows and frames have different contexts. So when you create a new f
4646

4747
Some objects of Node context are copied to Browser context so that scripts running in Browser context can access Node.js objects:
4848

49-
* `nw` -- the object of all [NW.js APIs](../../References)
49+
* `nw` -- the object of all NW.js APIs in **`References`** section
5050
* `global` -- the global object of Node Context; same as `nw.global`
5151
* `require` -- the `require()` function for loading Node.js modules; similar to `nw.require()`, but it also supports `require('nw.gui')` to load NW.js API module.
5252
* `process` -- the [process module](https://nodejs.org/api/globals.html#globals_process) of Node.js; same as `nw.process`
@@ -74,7 +74,7 @@ Scripts running in the Node context can use [JS builtin objects]() like browse
7474
**All node modules shares a same Node context in separate context mode**. But you have several ways to create new Node contexts:
7575

7676
* Set `new_instance` option to `true` when creating window with [`Window.open()`](../../References/Window.md#windowopenurl-options-callback)
77-
* Start NW.js with `--mixed-context` CLI option to turn NW.js into [Mixed Context mode](#mixed-context)
77+
* Start NW.js with `--mixed-context` CLI option to turn NW.js into [Mixed Context mode](#mixed-context-mode)
7878

7979
#### Access Browser and NW.js API in Node Context
8080

@@ -96,7 +96,7 @@ In the browser side (index.html):
9696
<script>
9797
var myscript = require('./myscript');
9898
// pass the `el` element to the Node function
99-
myscript.setText(document.getElementbyId('el'));
99+
myscript.setText(document.getElementById('el'));
100100
// you will see "hello" in the element
101101
</script>
102102
```
@@ -110,7 +110,7 @@ Relative paths in node modules are resolved according to path of that module (li
110110

111111
## Mixed Context Mode
112112

113-
Mixed context is introduced in NW.js 0.13. When running NW.js with [`--mixed-context` CLI option](../../References/Command Line Options.md#mixedcontext), a new Node context is created at the time of each browser context creation and running in a same context as browser context, a.k.a. the Mixed context.
113+
Mixed context is introduced in NW.js 0.13. When running NW.js with [`--mixed-context` CLI option](../../References/Command Line Options.md#-mixed-context), a new Node context is created at the time of each browser context creation and running in a same context as browser context, a.k.a. the Mixed context.
114114

115115
### Load Script in Mixed Context Mode
116116

docs/References/Window.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Get or set the page zoom. `0` for normal size; positive value for zooming in; ne
126126

127127
## win.cookies.*
128128

129-
This includes multiple functions to manipulate the cookies. The API is defined in the same way as [Chrome Extensions'](http://developer.chrome.com/extensions/cookies.html). NW.js supports the `get`, `getAll`, `remove` and `set` methods; `onChanged` event (supporting both `addListener` and `removeListener` function on this event).
129+
This includes multiple functions to manipulate the cookies. The API is defined in the same way as [Chrome Extensions](http://developer.chrome.com/extensions/cookies.html). NW.js supports the `get`, `getAll`, `remove` and `set` methods; `onChanged` event (supporting both `addListener` and `removeListener` function on this event).
130130

131131
And anything related to `CookieStore` in the Chrome extension API is not supported, because there is only one global cookie store in NW.js apps.
132132

@@ -571,7 +571,7 @@ Emitted when window leaves fullscreen state.
571571

572572
## Event: zoom
573573

574-
Emitted when window zooming changed. It has a parameter indicating the new zoom level. See [`win.zoom()` method](#winzoom) for the parameter's value definition.
574+
Emitted when window zooming changed. It has a parameter indicating the new zoom level. See [`win.zoom()` method](#winzoomlevel) for the parameter's value definition.
575575

576576
## Event: capturepagedone
577577

0 commit comments

Comments
 (0)