Skip to content

Commit 94ce8bd

Browse files
committed
merge upstream
2 parents 3c1b266 + 4955c8b commit 94ce8bd

181 files changed

Lines changed: 14457 additions & 4372 deletions

File tree

Some content is hidden

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

.babelrc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,22 @@
33
"loose": [
44
"all"
55
],
6+
67
"blacklist": [
78
"es6.tailCall",
89
"es6.forOf",
910
"es7.trailingFunctionCommas",
1011
"es7.comprehensions",
1112
"es7.exportExtensions"
1213
],
13-
"plugins": ["babel-plugin-object-assign"]
14+
15+
"plugins": [
16+
"babel-plugin-object-assign"
17+
],
18+
"extra": {
19+
"externalHelperPlugin": {
20+
"path": "util/babelHelpers.js",
21+
"base": "src"
22+
}
23+
}
1424
}

.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"eol-last": 2,
1818
"dot-notation": [2, { "allowKeywords": true }],
1919
"semi": [0, "never"],
20+
"semi-spacing": 0,
2021
"curly": 0,
2122
"eqeqeq": [2, "allow-null"],
2223
"no-undef": 2,

.travis.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
sudo: false
12
language: node_js
23
node_js:
3-
- 0.10
4-
before_script:
5-
- 'npm install -g karma karma-cli'
4+
- 4
5+
cache:
6+
directories:
7+
- node_modules
8+
before_install:
9+
- export CHROME_BIN=chromium-browser
10+
- export DISPLAY=:99.0
11+
- sh -e /etc/init.d/xvfb start

CHANGELOG.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
v3.0.0 - Sat, 24 Oct 2015 01:55:25 GMT
2+
--------------------------------------
3+
4+
- [8172eaa](../../commit/8172eaa) [added] selectlist selectAll() method
5+
6+
7+
8+
v3.0.0-beta.1 - Mon, 12 Oct 2015 13:09:20 GMT
9+
---------------------------------------------
10+
11+
- [65e94f9](../../commit/65e94f9) [fixed] moment localizer
12+
- [bf468be](../../commit/bf468be) [fixed] recalc timeList when locale info changes
13+
- [f002680](../../commit/f002680) [fixed] add onNavigate to docs
14+
- [8ba4202](../../commit/8ba4202) [fixed] wrong list message displayed when all items selected on the multiselect
15+
- [3be1b7d](../../commit/3be1b7d) [changed] reorder onKeyDown and respect preventDefault
16+
17+
18+
19+
v3.0.0-beta.0 - Thu, 08 Oct 2015 20:51:46 GMT
20+
---------------------------------------------
21+
22+
- [5457935](../../commit/5457935) [added] localizers of different types
23+
- [f865da1](../../commit/f865da1) [removed] IOS click hack, since react 0.14 handles this correctly
24+
- [3be1c86](../../commit/3be1c86) [added] pass describedBy to datepicker
25+
- [804db61](../../commit/804db61) [fixed] Calendar only refocuses itself when previously focused
26+
- [3fc44c3](../../commit/3fc44c3) [fixed] properly compare TimeList labels
27+
- [31c5479](../../commit/31c5479) [changed] globalize localizer now a function that takes a globalize instance
28+
- [44818fd](../../commit/44818fd) [added] autoFocus support
29+
30+
31+
32+
v3.0.0-alpha.5 - Wed, 30 Sep 2015 14:33:16 GMT
33+
----------------------------------------------
34+
35+
- [ac46a2a](../../commit/ac46a2a) [fixed] Calendar only refocuses itself when previously focused
36+
- [1fc7c38](../../commit/1fc7c38) [fixed] properly compare TimeList labels
37+
- [e74a2ed](../../commit/e74a2ed) [changed] globalize localizer now a function that takes a globalize instance
38+
- [180bc31](../../commit/180bc31) [added] autoFocus support
39+
40+
41+
42+
v3.0.0-alpha.4 - Wed, 16 Sep 2015 09:42:02 GMT
43+
----------------------------------------------
44+
45+
- [1fc7c38](../../commit/1fc7c38) [fixed] properly compare TimeList labels
46+
47+
48+
49+
v3.0.0-alpha.3 - Tue, 15 Sep 2015 10:27:55 GMT
50+
----------------------------------------------
51+
52+
- [e74a2ed](../../commit/e74a2ed) [changed] globalize localizer now a function that takes a globalize instance
53+
- [180bc31](../../commit/180bc31) [added] autoFocus support
54+
55+
56+

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ Pick and choose one, or more of the following Components
1818

1919
__Demos and Documentation [here](http://jquense.github.io/react-widgets/docs/)__
2020

21-
### Migration: 2.0
22-
23-
Migration guide can be found [here](http://jquense.github.io/react-widgets/docs/index.htm#migration)
24-
2521
### Install
2622

2723
`npm install react-widgets`

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-widgets",
3-
"version": "2.8.0",
3+
"version": "2.8.2",
44
"main": "dist/react-widgets.js",
55
"description": "A set of input widgets for React",
66
"homepage": "http://jquense.github.io/react-widgets/docs",
@@ -51,4 +51,4 @@
5151
"fontello-config.json",
5252
"README.md"
5353
]
54-
}
54+
}

build/babel.js

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
var args = require('yargs').argv
2+
, babel = require('babel-core')
3+
, fs = require('fs')
4+
, outputFileSync = require('output-file-sync')
5+
, glob = require('glob')
6+
, path = require('path');
7+
8+
var helpers = []
9+
, babelrc = JSON.parse(
10+
fs.readFileSync(path.join(__dirname, '../.babelrc')));
11+
12+
args._.forEach(function (input) {
13+
var files = glob.sync(input + '/**/*.js*');
14+
if (!files.length) files = [input];
15+
16+
files.forEach(function(file){
17+
var relative = file.replace(/\.(\w*?)$/, '') + '.js'
18+
, dest = path.join(args.outDir, path.relative(input, relative))
19+
, data = babel.transformFileSync(file, {
20+
externalHelpers: true,
21+
plugins: [
22+
'babel-plugin-external-helpers:after'
23+
]
24+
});
25+
26+
outputFileSync(dest, data.code);
27+
28+
(data.metadata.usedHelpers || []).forEach(function(helper){
29+
if (helpers.indexOf(helper) === -1)
30+
helpers.push(helper)
31+
})
32+
33+
console.log(file + ' -> ' + dest);
34+
});
35+
36+
});
37+
38+
if (helpers.length) {
39+
var outHelper = path.join(args.outDir, babelrc.extra.externalHelperPlugin.path)
40+
console.log('outputing helper file: ', outHelper)
41+
outputFileSync(
42+
outHelper, babel.buildExternalHelpers(helpers, 'umd'))
43+
}

build/browser.config.js

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
var path = require('path')
2+
, makeConfig = require('./make-config');
3+
4+
module.exports = makeConfig({
5+
6+
noCompile: true,
7+
8+
banner: true,
9+
10+
minimize: false,
11+
12+
entry: {
13+
'react-widgets': './lib/index.js',
14+
'react-widgets-globalize': './lib/localizers/globalize.js',
15+
'react-widgets-moment': './lib/localizers/moment.js',
16+
'react-widgets-simple-number': './lib/localizers/simple-number.js'
17+
},
18+
19+
output: {
20+
path: path.join(__dirname, '../dist'),
21+
filename: '[name].js',
22+
library: 'ReactWidgets',
23+
libraryTarget: 'umd'
24+
},
25+
26+
externals: {
27+
'../configure': 'ReactWidgets',
28+
29+
'react-dom': {
30+
root: 'ReactDOM',
31+
commonjs: 'react-dom',
32+
commonjs2: 'react-dom'
33+
},
34+
react: {
35+
root: 'React',
36+
commonjs: 'react',
37+
commonjs2: 'react'
38+
}
39+
}
40+
})

build/dev.config.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
var path = require('path')
2+
, makeConfig = require('./make-config');
3+
4+
module.exports = makeConfig({
5+
6+
hot: false,
7+
8+
production: false,
9+
10+
devtool: 'source-map',
11+
12+
entry: path.join(__dirname, '../dev/dev.jsx'),
13+
14+
loaders: [
15+
{
16+
test: /globalize/,
17+
loader: 'imports?define=>false'
18+
},
19+
{
20+
test: /cldr-data.+\.js$/,
21+
loader: 'imports?define=>false'
22+
}
23+
],
24+
output: {
25+
filename: 'bundle.js',
26+
path: __dirname,
27+
publicPath: '/dev'
28+
}
29+
30+
})

0 commit comments

Comments
 (0)