Skip to content

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
jajugoguma committed Jul 1, 2021
2 parents 428c6aa + d25a285 commit ac61346
Show file tree
Hide file tree
Showing 20 changed files with 7,471 additions and 21,288 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
},
env: {
browser: true,
jasmine: true,
jest: true,
commonjs: true
},
globals: {
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ Desktop.ini
.project
.metadata

#report / screenshots
report
screenshots

# Atom
tags
.ctags
Expand Down
57 changes: 36 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,33 @@


## 🚩 Table of Contents
* [Collect statistics on the use of open source](#Collect-statistics-on-the-use-of-open-source)
* [Documents](#-documents)
* [Features](#-features)
* [Examples](#-examples)
* [Install](#-install)
* [Usage](#-usage)
* [Dependency](#-dependency)
* [Browser Support](#-browser-support)
* [Pull Request Steps](#-pull-request-steps)
* [Contributing](#-contributing)
* [TOAST UI Family](#-toast-ui-family)
* [License](#-license)

- [Collect statistics on the use of open source](#collect-statistics-on-the-use-of-open-source)
- [📙 Documents](#-documents)
- [🎨 Features](#-features)
- [🐾 Examples](#-examples)
- [💾 Install](#-install)
- [Via Package Manager](#via-package-manager)
- [npm](#npm)
- [bower](#bower)
- [Via Contents Delivery Network (CDN)](#via-contents-delivery-network-cdn)
- [Download Source Files](#download-source-files)
- [🔨 Usage](#-usage)
- [HTML](#html)
- [JavaScript](#javascript)
- [Using namespace in browser environment](#using-namespace-in-browser-environment)
- [Using module format in node environment](#using-module-format-in-node-environment)
- [🔩 Dependency](#-dependency)
- [🌏 Browser Support](#-browser-support)
- [🔧 Pull Request Steps](#-pull-request-steps)
- [Setup](#setup)
- [Develop](#develop)
- [Running dev server](#running-dev-server)
- [Running test](#running-test)
- [Pull Request](#pull-request)
- [💬 Contributing](#-contributing)
- [🍞 TOAST UI Family](#-toast-ui-family)
- [📜 License](#-license)


## Collect statistics on the use of open source
Expand All @@ -35,11 +50,11 @@ It also serves as important index to determine the future course of projects.
To disable GA, use the following `usageStatistics` option when creating the instance.

```js
var options = {
const options = {
...
usageStatistics: false
}
var instance = new DatePicker(container, options);
const instance = new DatePicker(container, options);
```

Or, include [`tui-code-snippet`](https://github.com/nhn/tui.code-snippet)(**v2.2.0** or **later**) and then immediately write the options as follows:
Expand Down Expand Up @@ -155,12 +170,12 @@ To get the constructor function, you should import the module using one of the f

#### Using namespace in browser environment
``` javascript
var DatePicker = tui.DatePicker;
const DatePicker = tui.DatePicker;
```

#### Using module format in node environment
``` javascript
var DatePicker = require('tui-date-picker'); /* CommonJS */
const DatePicker = require('tui-date-picker'); /* CommonJS */
```

``` javascript
Expand All @@ -170,10 +185,10 @@ import DatePicker from 'tui-date-picker'; /* ES6 */
You can create an instance with [options](http://nhn.github.io/tui.date-picker/latest/DatePicker) and call various APIs after creating an instance.

``` javascript
var container = document.getElementById('tui-date-picker-container');
var target = document.getElementById('tui-date-picker-target');
const container = document.getElementById('tui-date-picker-container');
const target = document.getElementById('tui-date-picker-target');

var instance = new DatePicker(container, {
const instance = new DatePicker(container, {
input: {
element: target
},
Expand Down Expand Up @@ -220,14 +235,14 @@ Let's start development!
You can see your code is reflected as soon as you saving the codes by running a server.
Don't miss adding test cases and then make green rights.

#### Run webpack-dev-server
#### Running dev server

``` sh
$ npm run serve
$ npm run serve:ie8 # Run on Internet Explorer 8
```

#### Run karma test
#### Running test

``` sh
$ npm run test
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"test",
"tui-note.config.js",
"tuidoc.config.json",
"karma.conf.js",
"jest.config.js",
"webpack.config.js",
"package.json",
"package-lock.json"
Expand Down
3 changes: 2 additions & 1 deletion examples/example09-changing-type.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
element: '#datepicker-input',
format: 'yyyy-MM-dd'
},
type: 'date'
type: 'date',
language: 'ko'
});

var datePickerTypes = document.querySelector('.radio-set');
Expand Down
8 changes: 8 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/* eslint-disable strict */
module.exports = {
moduleFileExtensions: ['js'],
testEnvironment: 'jsdom',
testMatch: ['<rootDir>/**/*.spec.js'],
transformIgnorePatterns: ['<rootDir>/node_modules/'],
clearMocks: true
};
153 changes: 0 additions & 153 deletions karma.conf.js

This file was deleted.

Loading

0 comments on commit ac61346

Please sign in to comment.