Skip to content

Commit 4a900a7

Browse files
jansiegeljansiegel
committed
Merge branch 'release/0.33.0'
2 parents 9c50466 + 2ddef36 commit 4a900a7

255 files changed

Lines changed: 29537 additions & 33998 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.

‎.config/development.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ module.exports.create = function create(envArgs) {
4545
commonjs2: 'pikaday',
4646
commonjs: 'pikaday',
4747
amd: 'pikaday',
48-
},
49-
zeroclipboard: {
50-
root: 'ZeroClipboard',
51-
commonjs2: 'zeroclipboard',
52-
commonjs: 'zeroclipboard',
53-
amd: 'zeroclipboard',
5448
}
5549
};
5650
c.module.rules.unshift({

‎.config/production.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ module.exports.create = function create(envArgs) {
8080
{
8181
from: {glob: 'node_modules/pikaday/css/pikaday.css'}, to: 'pikaday', flatten: true
8282
},
83-
{ // zeroclipboard
84-
from: {glob: 'node_modules/zeroclipboard/dist/ZeroClipboard.@(js|swf)'}, to: 'zeroclipboard', flatten: true
85-
},
86-
{
87-
from: {glob: 'node_modules/zeroclipboard/LICENSE'}, to: 'zeroclipboard', flatten: true
88-
},
8983
])
9084
);
9185
}

‎.config/watch.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ module.exports.create = function create(envArgs) {
4040
commonjs2: 'pikaday',
4141
commonjs: 'pikaday',
4242
amd: 'pikaday',
43-
},
44-
zeroclipboard: {
45-
root: 'ZeroClipboard',
46-
commonjs2: 'zeroclipboard',
47-
commonjs: 'zeroclipboard',
48-
amd: 'zeroclipboard',
4943
}
5044
};
5145
c.module.rules.unshift({

‎.eslintrc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"extends": "airbnb-base",
44
"env": {
55
"browser": true,
6-
"node": true
6+
"commonjs": true,
7+
"jasmine": true,
8+
"jest": true
79
},
810
"globals": {},
911
"rules": {
@@ -40,6 +42,7 @@
4042
"no-undef": 0,
4143
"no-underscore-dangle": 0,
4244
"no-unused-vars": 1,
45+
"no-restricted-globals": ["error", "Handsontable"],
4346
"no-use-before-define": 0,
4447
"no-var": 0,
4548
"no-void": 0,
@@ -107,7 +110,9 @@
107110
2,
108111
2,
109112
{
110-
"SwitchCase": 1
113+
"SwitchCase": 1,
114+
"FunctionDeclaration": {"parameters": "first"},
115+
"FunctionExpression": {"parameters": "first"}
111116
}
112117
],
113118
"comma-style": [

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var handsontable = require('handsontable');
5050
```
5151
To bundle Handsontable with [Browserify](http://browserify.org) you must specify the module names of all required modules:
5252

53-
`browserify main.js -o bundle.js -r moment -r pikaday -r zeroclipboard -r numbro`
53+
`browserify main.js -o bundle.js -r moment -r pikaday -r numbro`
5454

5555
## Basic usage
5656
Assuming you have already installed Handsontable, add an empty `<div>` element that will be turned into a spreadsheet:

‎bower.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
"dependencies": {
3737
"moment": "^2.13.0",
3838
"numbro": "^1.8.0",
39-
"pikaday": "^1.4.0",
40-
"zeroclipboard": "^2.2.0"
39+
"pikaday": "^1.4.0"
4140
},
4241
"devDependencies": {
4342
"chroma-js": "~0.5.6"

‎demo/ajax.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<link data-jsfiddle="common" rel="stylesheet" media="screen" href="../dist/pikaday/pikaday.css">
1212
<script data-jsfiddle="common" src="../dist/pikaday/pikaday.js"></script>
1313
<script data-jsfiddle="common" src="../dist/moment/moment.js"></script>
14-
<script data-jsfiddle="common" src="../dist/zeroclipboard/ZeroClipboard.js"></script>
1514
<script data-jsfiddle="common" src="../dist/numbro/numbro.js"></script>
1615
<script data-jsfiddle="common" src="../dist/numbro/languages.js"></script>
1716
<script data-jsfiddle="common" src="../dist/handsontable.js"></script>

‎demo/align_cell.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<link data-jsfiddle="common" rel="stylesheet" media="screen" href="../dist/pikaday/pikaday.css">
1212
<script data-jsfiddle="common" src="../dist/pikaday/pikaday.js"></script>
1313
<script data-jsfiddle="common" src="../dist/moment/moment.js"></script>
14-
<script data-jsfiddle="common" src="../dist/zeroclipboard/ZeroClipboard.js"></script>
1514
<script data-jsfiddle="common" src="../dist/numbro/numbro.js"></script>
1615
<script data-jsfiddle="common" src="../dist/numbro/languages.js"></script>
1716
<script data-jsfiddle="common" src="../dist/handsontable.js"></script>

‎demo/autocomplete.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<link data-jsfiddle="common" rel="stylesheet" media="screen" href="../dist/pikaday/pikaday.css">
1414
<script data-jsfiddle="common" src="../dist/pikaday/pikaday.js"></script>
1515
<script data-jsfiddle="common" src="../dist/moment/moment.js"></script>
16-
<script data-jsfiddle="common" src="../dist/zeroclipboard/ZeroClipboard.js"></script>
1716
<script data-jsfiddle="common" src="../dist/numbro/numbro.js"></script>
1817
<script data-jsfiddle="common" src="../dist/numbro/languages.js"></script>
1918
<script data-jsfiddle="common" src="../dist/handsontable.js"></script>

‎demo/backbone.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<link data-jsfiddle="common" rel="stylesheet" media="screen" href="../dist/pikaday/pikaday.css">
1212
<script data-jsfiddle="common" src="../dist/pikaday/pikaday.js"></script>
1313
<script data-jsfiddle="common" src="../dist/moment/moment.js"></script>
14-
<script data-jsfiddle="common" src="../dist/zeroclipboard/ZeroClipboard.js"></script>
1514
<script data-jsfiddle="common" src="../dist/numbro/numbro.js"></script>
1615
<script data-jsfiddle="common" src="../dist/numbro/languages.js"></script>
1716
<script data-jsfiddle="common" src="../dist/handsontable.js"></script>

0 commit comments

Comments
 (0)