Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-07-28 20:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:transloadit/uppy

Browse source
This commit is contained in:
Ifedapo Olarewaju 2018-02-08 12:31:13 +01:00
commit 4f65974ec5
9 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -64,7 +64,7 @@ $ npm install uppy --save
We recommend installing from npm and then using a module bundler such as [Webpack](http://webpack.github.io/), [Browserify](http://browserify.org/) or [Rollup.js](http://rollupjs.org/).
Add CSS [uppy.min.css](https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.css), either to `<head>` of your HTML page or include in JS, if your bundler of choice supports it — transforms and plugins are available for Browserify and Webpack.
Add CSS [uppy.min.css](https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.css), either to `<head>` of your HTML page or include in JS, if your bundler of choice supports it — transforms and plugins are available for Browserify and Webpack.
Alternatively, you can also use a pre-built bundle from Transloadit's CDN: Edgly. In that case `Uppy` will attach itself to the global `window.Uppy` object.
@ -73,12 +73,12 @@ Alternatively, you can also use a pre-built bundle from Transloadit's CDN: Edgly
1\. Add a script to the bottom of `<body>`:
``` html
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.js"></script>
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.js"></script>
```
2\. Add CSS to `<head>`:
``` html
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.css" rel="stylesheet">
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.css" rel="stylesheet">
```
3\. Initialize:

2
bin/upload-to-cdn.sh
View file

@ -8,7 +8,7 @@
# - Checks if a tag is being built (on Travis - otherwise opts to continue execution regardless)
# - Installs AWS CLI if needed
# - Assumed a fully built uppy is in root dir (unless a specific tag was specified, then it's fetched from npm)
# - Runs npm pack, and stores files to e.g. https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.css
# - Runs npm pack, and stores files to e.g. https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.css
# - Uses local package by default, if [version] argument was specified, takes package from npm
#
# Run as:

4
examples/cdn-example/index.html
View file

@ -4,11 +4,11 @@
<title></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.css" rel="stylesheet">
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.css" rel="stylesheet">
</head>
<body>
<button id="uppyModalOpener">Open Modal</button>
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.js"></script>
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.js"></script>
<script>
const uppy = Uppy.Core({debug: true, autoProceed: false})
.use(Uppy.Dashboard, { trigger: '#uppyModalOpener' })

4
examples/uppy-with-server/client/index.html
View file

@ -4,11 +4,11 @@
<title></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.css" rel="stylesheet">
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.css" rel="stylesheet">
</head>
<body>
<button id="uppyModalOpener">Open Modal</button>
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.js"></script>
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.js"></script>
<script>
const uppy = Uppy.Core({debug: true, autoProceed: false})
.use(Uppy.Dashboard, { trigger: '#uppyModalOpener' })

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "uppy",
"version": "0.22.3",
"version": "0.22.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "uppy",
"version": "0.22.3",
"version": "0.22.4",
"description": "Extensible file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Dropbox and Google Drive, S3 and more :dog:",
"main": "lib/index.js",
"jsnext:main": "src/index.js",

4
website/src/docs/index.md
View file

@ -48,12 +48,12 @@ Alternatively, you can also use a pre-built bundle from Transloadit's CDN: Edgly
1\. Add a script to the bottom of `<body>`:
``` html
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.js"></script>
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.js"></script>
```
2\. Add CSS to `<head>`:
``` html
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.css" rel="stylesheet">
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.css" rel="stylesheet">
```
3\. Initialize:

4
website/src/examples/i18n/app.html
View file

@ -1,11 +1,11 @@
<!-- Basic Uppy styles. You can use Transloadit's CDN, Edgly:
https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.css -->
https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.css -->
<link rel="stylesheet" href="/uppy/uppy.min.css">
<div class="UppyDragDrop"></div>
<!-- Load Uppy pre-built bundled version. You can use Transloadit's CDN, Edgly:
https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.js -->
https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.js -->
<script src="/uppy/uppy.min.js"></script>
<script>
var uppy = Uppy.Core({ debug: true });

4
website/themes/uppy/layout/index.ejs
View file

@ -79,8 +79,8 @@
<p>© <%- date(Date.now(), 'YYYY') %> <a href="https://transloadit.com" target="_blank">Transloadit</a></p>
</footer>
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.css" rel="stylesheet">
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.3/dist/uppy.min.js"></script>
<link href="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.css" rel="stylesheet">
<script src="https://transloadit.edgly.net/releases/uppy/v0.22.4/dist/uppy.min.js"></script>
<script>
var PROTOCOL = location.protocol === 'https:' ? 'https' : 'http'