eessppeelllloo/image-sequencer
1
0
Fork 0
mirror of https://github.com/publiclab/image-sequencer.git synced 2025-12-17 22:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'headless-option-puppeteer' of github.com:publiclab/image-sequencer into headless-option-puppeteer

Browse Source
This commit is contained in:
jywarren
2019-04-19 17:57:29 -04:00
parent 2cdfb9dcd8 9609a0af72
commit 20f2b05076
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -201,15 +201,17 @@ var sequencer = ImageSequencer();
### Loading an Image into the Sequencer ### Loading an Image into the Sequencer
The `loadImage` method is used to load an image into the sequencer. It accepts The `loadImage` method is used to load an image into the sequencer. It accepts
a name and an image. The method also accepts an optional callback. an image `src`, either a URL or a data-url. The method also accepts an optional callback.
```js ```js
sequencer.loadImage(image_src, optional_callback); sequencer.loadImage(image_src, optional_callback);
``` ```
On `Node.js` the `image_src` may be a DataURI or a local path or a URL. On `Node.js` the `image_src` may be a DataURI or a local path or a URL.
On browsers, it may be a DatURI, a local image or a URL (Unless this violates On browsers, it may be a DatURI, a local image or a URL (Unless this violates
CORS Restrictions). To sum up, these are accepted: CORS Restrictions). To sum up, these are accepted:
* Images in the same domain (or directory - for a local implementation) * Images in the same domain (or directory - for a local implementation)
* CORS-Proof images in another domain. * CORS-Proof images in another domain.
* DataURLs * DataURLs

2
src/modules/_nomodule/gl-context.js
View File

@@ -9,7 +9,7 @@ module.exports = function runInBrowserContext(input, callback, step, options) {
var obj = { input: input, modOptions: minOptions } var obj = { input: input, modOptions: minOptions }
puppeteer.launch().then(function(browser) { puppeteer.launch({headless: true, args:['--no-sandbox']}).then(function(browser) {
browser.newPage().then(page => { browser.newPage().then(page => {
/* Maybe there is a better way to this, loading the page coz localstorage API /* Maybe there is a better way to this, loading the page coz localstorage API
is not available otherwise */ is not available otherwise */