Skip to content

Commit dcbcf43

Browse files
committed
Add es6-shim as polyfill and minify underscore.js
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent e03bc6e commit dcbcf43

9 files changed

Lines changed: 2616 additions & 6585 deletions

File tree

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"bootstrap": "3.3.7",
2121
"clipboard": "1.7.1",
2222
"davclient.js": "https://github.com/evert/davclient.js.git#0.1.2",
23-
"es6-promise": "https://github.com/jakearchibald/es6-promise.git#2.3.0",
2423
"handlebars": "4.0.5",
2524
"jcrop": "0.9.12",
2625
"jquery": "2.1.4",
@@ -33,6 +32,7 @@
3332
"snapjs": "2.0.0-rc1",
3433
"strengthify": "0.5.5",
3534
"underscore": "1.8.3",
36-
"zxcvbn": "4.4.2"
35+
"zxcvbn": "4.4.2",
36+
"es6-shim": "^0.35.4"
3737
}
3838
}

core/js/core.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"jquery/dist/jquery.min.js",
44
"jquery-migrate/jquery-migrate.min.js",
55
"jquery-ui/ui/minified/jquery-ui.custom.min.js",
6-
"underscore/underscore.js",
6+
"underscore/underscore-min.js",
77
"moment/min/moment-with-locales.min.js",
88
"handlebars/handlebars.min.js",
99
"blueimp-md5/js/md5.min.js",
1010
"bootstrap/js/tooltip.js",
1111
"backbone/backbone.js",
12-
"es6-promise/dist/es6-promise.js",
12+
"es6-shim/es6-shim.min.js",
1313
"davclient.js/lib/client.js",
1414
"clipboard/dist/clipboard.min.js",
1515
"autosize/dist/autosize.min.js",

core/vendor/.gitignore

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ README*
1616
# underscore
1717
underscore/**
1818
!underscore/.bower.json
19-
!underscore/underscore.js
19+
!underscore/underscore-min.js
2020
!underscore/LICENSE
2121

2222
# blueimp-md5
@@ -135,13 +135,11 @@ davclient.js/**
135135
!davclient.js/lib/client.js
136136
!davclient.js/LICENSE
137137

138-
# es6-promise
139-
es6-promise/**
140-
!es6-promise/.bower.json
141-
!es6-promise/LICENSE
142-
!es6-promise/dist
143-
es6-promise/dist/*
144-
!es6-promise/dist/es6-promise.js
138+
# es6-shim
139+
es6-shim/**
140+
!es6-shim/.bower.json
141+
!es6-shim/LICENSE
142+
!es6-shim/es6-shim.min.js
145143

146144
# base64
147145
base64/*min.js

core/vendor/core.js

Lines changed: 2522 additions & 5025 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/vendor/es6-shim/.bower.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"name": "es6-shim",
3+
"repo": "paulmillr/es6-shim",
4+
"description": "ECMAScript 6 (Harmony) compatibility shims for legacy JavaScript engines",
5+
"keywords": [
6+
"ecmascript",
7+
"harmony",
8+
"es6",
9+
"shim",
10+
"promise",
11+
"promises",
12+
"setPrototypeOf",
13+
"map",
14+
"set",
15+
"__proto__"
16+
],
17+
"main": "es6-shim.js",
18+
"scripts": [
19+
"es6-shim.js"
20+
],
21+
"dependencies": {},
22+
"development": {},
23+
"ignore": [
24+
"**/.*",
25+
"node_modules",
26+
"components",
27+
"test"
28+
],
29+
"homepage": "https://github.com/paulmillr/es6-shim",
30+
"version": "0.35.4",
31+
"_release": "0.35.4",
32+
"_resolution": {
33+
"type": "version",
34+
"tag": "0.35.4",
35+
"commit": "271142ca5c58b7bfec6970b1c070515da0d8ef98"
36+
},
37+
"_source": "https://github.com/paulmillr/es6-shim.git",
38+
"_target": "^0.35.4",
39+
"_originalSource": "es6-shim"
40+
}

core/vendor/es6-shim/LICENSE

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
The project was initially based on [es6-shim by Axel Rauschmayer](https://github.com/rauschma/es6-shim).
2+
3+
Current maintainers are: [Paul Miller](http://paulmillr.com), [Jordan Harband](https://github.com/ljharb), and [C. Scott Ananian](http://cscott.net).
4+
5+
The MIT License (MIT)
6+
7+
Copyright (c) 2013-2016 Paul Miller (http://paulmillr.com) and contributors
8+
9+
Permission is hereby granted, free of charge, to any person obtaining a copy
10+
of this software and associated documentation files (the "Software"), to deal
11+
in the Software without restriction, including without limitation the rights
12+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
copies of the Software, and to permit persons to whom the Software is
14+
furnished to do so, subject to the following conditions:
15+
16+
The above copyright notice and this permission notice shall be included in
17+
all copies or substantial portions of the Software.
18+
19+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
THE SOFTWARE.
26+

core/vendor/es6-shim/es6-shim.min.js

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/vendor/underscore/underscore-min.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)