Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite plugin Search to es6. #4892

Merged
merged 19 commits into from Apr 4, 2018
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter...
Filter file types
Jump to…
The table of contents is too big for display.

Always

Just for now

merge with develop #4629

  • Loading branch information...
pnowak committed Mar 2, 2018
commit f7f3468081a8d1f9ead17b00d5e846d9da04aa90
@@ -139,7 +139,8 @@
"regenerator-runtime/runtime",
"./common",
"./jasmine",
"./MemoryLeakTest"
"./MemoryLeakTest",
"../MemoryLeakTest"
]
}]
]
@@ -22,7 +22,7 @@ module.exports.create = function create(envArgs) {
configBase.forEach(function(c) {
c.output.filename = PACKAGE_FILENAME + '.js';

c.devtool = 'cheap-module-source-map';
c.devtool = 'source-map';
// Exclude all external dependencies from 'base' bundle (handsontable.js and handsontable.css files)
c.externals = {
numbro: {
@@ -36,9 +36,6 @@ function getEntryJsFiles() {

const ruleForSnippetsInjection = {
test: /\.js$/,
include: [
path.resolve(__dirname, '../', SOURCE_LANGUAGES_DIRECTORY),
],
loader: StringReplacePlugin.replace({
replacements: [
{
@@ -69,6 +66,7 @@ module.exports.create = function create() {
path: path.resolve(__dirname, '../' + OUTPUT_LANGUAGES_DIRECTORY),
libraryTarget: 'umd',
filename: '[name].js',
// Workaround below: Without this option webpack would export all language packs as globals
libraryExport: '___',
umdNamedDefine: true
},
@@ -42,6 +42,7 @@ module.exports.create = function create(envArgs) {
externalCssFiles: [
'lib/normalize.css',
'../dist/handsontable.css',
'helpers/common.css',
],
externalJsFiles: [
'../test/lib/phantom-reporter.js',
@@ -0,0 +1,49 @@
/**
* Config responsible for building Mobile End-to-End test files (bundled into `test/dist/`):
* - mobile.entry.js
* - helpers.entry.js
*/
const path = require('path');
const webpack = require('webpack');
const configFactory = require('./test-e2e');
const JasmineHtml = require('./plugin/jasmine-html');
const HtmlWebpackPlugin = require('html-webpack-plugin');

module.exports.create = function create(envArgs) {
const config = configFactory.create(envArgs);

config.forEach(function(c) {

// Remove all 'JasmineHtml' instances
c.plugins = c.plugins.filter(function(plugin) {
return !(plugin instanceof HtmlWebpackPlugin);
});

c.plugins.push(
new JasmineHtml({
filename: path.resolve(__dirname, '../test/MobileRunner.html'),
baseJasminePath: '../',
externalCssFiles: [
'lib/normalize.css',
'../dist/handsontable.css',
'helpers/common.css',
],
externalJsFiles: [
'../test/lib/phantom-reporter.js',
'lib/jquery.min.js',
'lib/jquery.simulate.js',
'lib/lodash.underscore.js',
'lib/backbone.js',
'../dist/numbro/numbro.js',
'../dist/numbro/languages.js',
'../dist/moment/moment.js',
'../dist/pikaday/pikaday.js',
'../dist/handsontable.js',
'../dist/languages/all.js',
],
})
);
});

return [].concat(config);
}
@@ -27,6 +27,7 @@ module.exports.create = function create(envArgs) {
externalCssFiles: [
'lib/normalize.css',
'../dist/handsontable.full.min.css',
'helpers/common.css',
],
externalJsFiles: [
'../test/lib/phantom-reporter.js',

This file was deleted.

@@ -72,7 +72,7 @@
"import/no-unresolved": [
2,
{
"ignore": ["handsontable"]
"ignore": ["handsontable", "walkontable"]
}
],
"no-mixed-operators": [
@@ -1,9 +1,11 @@
.DS_Store
.grunt
.idea
.vscode
_SpecRunner.html
test/E2ERunner.html
test/UnitRunner.html
test/MobileRunner.html
test/dist/
src/3rdparty/walkontable/test/dist/
src/3rdparty/walkontable/dist/
@@ -0,0 +1,46 @@
# Handsontable Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@handsontable.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
@@ -5,9 +5,9 @@ Your contributions to this project are very welcome. If you want to fix a bug or
1. Sign this [Contributor License Agreement](https://goo.gl/forms/yuutGuN0RjsikVpM2) to allow us to publish your changes to the code.
2. Make your changes on a separate branch. This will speed up the merging process.
3. Always make the target of your pull request the `develop` branch, not `master`.
4. Do not edit files in `dist/` directory (e.g: `handsontable.js`, `handsontable.css`, `handsontable.full.js`, `handsontable.full.css`). Instead, edit files inside the `src/` directory and then use `npm run build` to make a build. More information about this you can find [here](https://docs.handsontable.com/tutorial-custom-build.html).
4. Do not edit files in `languages/` (e.g: `index.js`, `all.js`, `en-US.js`) and `dist/` (e.g: `handsontable.js`, `handsontable.css`, `handsontable.full.js`, `handsontable.full.css`, `all.js`, `en-US.js`) directories. Instead, edit files inside the `src/` directory and then use `npm run build` to make a build. More information about this you can find [here](https://docs.handsontable.com/tutorial-custom-build.html).
5. **Important: For any change you make, please add at least one test case** in `test/e2e/` (for End-to-End tests), `test/unit/` or `src/3rdparty/walkontable/test/spec/`. That will help us understand the issue and make sure that it stays fixed forever. Read more about our [testing process](http://docs.handsontable.com/tutorial-testing.html).
6. Please review our [coding style](https://github.com/handsontable/handsontable/wiki/Coding-style) for instructions on how to properly style the code.
6. Please review our [coding style](https://github.com/airbnb/javascript) for instructions on how to properly style the code.
7. Add a thorough description of all the changes.

Thank you for your commitment!
@@ -1,19 +1,26 @@
<br/>
<div align="center">
<a href="//handsontable.com" target="_blank"><img src="https://raw.githubusercontent.com/handsontable/static-files/master/Images/Logo/Handsontable/Handsontable-logo-300-74-new.png" alt="Handsontable Community Edition logo" /></a>
</div>
<br/><br/>
<br/>
[**Handsontable Community Edition (CE)**](//handsontable.com) is an open source JavaScript/HTML5 UI Spreadsheet component for web apps. It easily integrates with any data source and comes with a variety of useful features like data binding, validation, sorting or powerful context menu. Actively supported by the Handsoncode team and many contributors.
[**Handsontable Community Edition (CE)**](//handsontable.com) is an open source JavaScript/HTML5 UI Spreadsheet component for web apps. It easily integrates with any data source and comes with a variety of useful features like data binding, validation, sorting or powerful context menu. It is available for [Vue](//github.com/handsontable/vue-handsontable-official), [React](//github.com/handsontable/react-handsontable), [Angular](//github.com/handsontable/angular-handsontable) and [Polymer](//github.com/handsontable/hot-table).
If you are looking for a commercial version, try out [Handsontable Pro](//github.com/handsontable/handsontable-pro).
If you are looking for an extended version, try out [Handsontable Pro](//github.com/handsontable/handsontable-pro).
[![Build status](https://travis-ci.org/handsontable/handsontable.png?branch=master)](//travis-ci.org/handsontable/handsontable)
[![Known Vulnerabilities](https://snyk.io/test/github/handsontable/handsontable/badge.svg)](//snyk.io/test/github/handsontable/handsontable)
[![npm](https://img.shields.io/npm/dm/handsontable.svg)](//npmjs.com/package/handsontable)
[![npm](https://img.shields.io/github/contributors/handsontable/handsontable.svg)](//github.com/handsontable/handsontable/graphs/contributors)
----
**We are looking for Contributors who would like to help us with translations. [Learn more](https://github.com/handsontable/handsontable/issues/4696)**
<br/>
Most wanted languages: French, Chinese, Italian, Spanish, Swedish and Russian.
---
<br/>
## Table of contents
@@ -52,7 +59,7 @@ npm install handsontable
```
**Alternative ways to install**
- See the [download section](//handsontable.com/ce-download.html) on how to install Handsontable CE using nuget, bower, yarn and more.
- See the [download section](//handsontable.com/community-download) on how to install Handsontable CE using nuget, bower, yarn and more.
<br/>
@@ -101,6 +108,8 @@ var hot = new Handsontable(container, {
- Context menu
- Adding comments to cells
- Dragging fill handle to populate data
- Internationalization
- Non-contiguous selection
[See a comparison table](//docs.handsontable.com/tutorial-features.html)
@@ -118,7 +127,7 @@ var hot = new Handsontable(container, {
### Resources
- [API Reference](//docs.handsontable.com/Core.html)
- [Compatibility](//docs.handsontable.com/tutorial-compatibility.html)
- [Change log](//docs.handsontable.com/tutorial-release-notes.html)
- [Change log](//github.com/handsontable/handsontable/releases)
- [Roadmap](//trello.com/b/PztR4hpj)
- [Newsroom](//twitter.com/handsontable)
@@ -157,6 +166,6 @@ If you would like to help us to develop Handsontable, please take a look at this
<br/>
### License
Handsontable Community Edition is released under the MIT license. [Learn more](//github.com/handsontable/handsontable/blob/master/LICENSE).
Handsontable Community Edition is released under the MIT license. [Read license](//github.com/handsontable/handsontable/blob/master/LICENSE).
Copyrights belong to Handsoncode sp. z o.o.
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.