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 Jun 18, 2021
2 parents 31dfe3e + 2af0ae2 commit 0c926aa
Show file tree
Hide file tree
Showing 21 changed files with 8,448 additions and 7,188 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
},
env: {
browser: true,
jasmine: true,
jest: true,
commonjs: true
},
globals: {
Expand Down
37 changes: 37 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: Bug
assignees: ''
---

## Describe the bug
A clear and concise description of what the bug is.

## To Reproduce
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

## Expected behavior
A clear and concise description of what you expected to happen.

## Screenshots
If applicable, add screenshots to help explain your problem.

## Desktop (please complete the following information):
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

## Smartphone (please complete the following information):
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

## Additional context
Add any other context about the problem here.
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: Enhancement, Need Discussion
assignees: ''
---

<!--
Thank you for your contribution.
When it comes to write an issue, please, use the template below.
To use the template is mandatory for submit new issue and we won't reply the issue that without the template.
-->

## Version
Write the version that you are currently using.

## Development Environment
Write the browser type, OS and so on.

## Current Behavior
Write a description of the current operation. You can add sample code, 'CodePen' or 'jsfiddle' links.

```js
// Write example code
```

## Expected Behavior
Write a description of the future action.
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Question
about: Create a question about the Tree
title: ''
labels: Question
assignees: ''
---

<!--
To make it easier for us to help you, please include as much useful information as possible.
Useful Links:
- tutorial: https://github.com/nhn/tui.tree/tree/master/docs
- API/Example: https://nhn.github.io/tui.tree/latest/
Before opening a new issue, please search existing issues https://github.com/nhn/tui.tree/issues
-->

## Summary

A clear and concise description of what the question is.

## Screenshots

If applicable, add screenshots to help explain your question.

## Version

Write the version of the Editor you are currently using.

## Additional context

Add any other context about the problem here.
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
26 changes: 0 additions & 26 deletions ISSUE_TEMPLATE.md

This file was deleted.

58 changes: 34 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,32 @@


## 🚩 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)
- [🌏 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 @@ -33,12 +47,12 @@ 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 TimePicker(container, options);
const instance = new TimePicker(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 @@ -147,12 +161,12 @@ To get the constructor function, you should import the module using one of the f

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

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

``` javascript
Expand All @@ -162,19 +176,15 @@ import TimePicker from 'tui-time-picker'; /* ES6 */
You can create an instance with [options](https://nhn.github.io/tui.time-picker/latest/TimePicker) and call various APIs after creating an instance.

``` javascript
var container = document.getElementById('tui-time-picker-container');
var instance = new TimePicker(container, { ... });
const container = document.getElementById('tui-time-picker-container');
const instance = new TimePicker(container, { ... });

instance.getHour();
```

For more information about the API, please see [here](https://nhn.github.io/tui.time-picker/latest/TimePicker).


## 🔩 Dependency
* [tui-code-snippet](https://github.com/nhn/tui.code-snippet) >= 2.2.0


## 🌏 Browser Support
| <img src="https://user-images.githubusercontent.com/1215767/34348387-a2e64588-ea4d-11e7-8267-a43365103afe.png" alt="Chrome" width="16px" height="16px" /> Chrome | <img src="https://user-images.githubusercontent.com/1215767/34348590-250b3ca2-ea4f-11e7-9efb-da953359321f.png" alt="IE" width="16px" height="16px" /> Internet Explorer | <img src="https://user-images.githubusercontent.com/1215767/34348380-93e77ae8-ea4d-11e7-8696-9a989ddbbbf5.png" alt="Edge" width="16px" height="16px" /> Edge | <img src="https://user-images.githubusercontent.com/1215767/34348394-a981f892-ea4d-11e7-9156-d128d58386b9.png" alt="Safari" width="16px" height="16px" /> Safari | <img src="https://user-images.githubusercontent.com/1215767/34348383-9e7ed492-ea4d-11e7-910c-03b39d52f496.png" alt="Firefox" width="16px" height="16px" /> Firefox |
| :---------: | :---------: | :---------: | :---------: | :---------: |
Expand Down Expand Up @@ -205,14 +215,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
26 changes: 0 additions & 26 deletions docs/ISSUE_TEMPLATE.md

This file was deleted.

46 changes: 46 additions & 0 deletions examples/example05-using-range.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<!DOCTYPE html>
<head lang="en">
<meta charset="UTF-8">
<title>5. Using range</title>
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Expires" content="-1">
<link rel="stylesheet" type="text/css" href="./css/tui-example-style.css" />
<link rel="stylesheet" type="text/css" href="../dist/tui-time-picker.css" />
</head>

<body>
<div class="code-html">
<table>
<tbody>
<tr>
<td><div id="timepicker-selectbox-meridiem"></div></td>
</tr>
<tr>
<td><div id="timepicker-spinbox"></div></td>
</tr>
</tbody>
</table>
</div>
<script type="text/javascript" src="../dist/tui-time-picker.js"></script>
<script type="text/javascript" class="code-js">
var tpSelectboxMeridiem = new tui.TimePicker('#timepicker-selectbox-meridiem', {
inputType: 'selectbox',
showMeridiem: true
});

var tpSpinbox = new tui.TimePicker('#timepicker-spinbox', {
inputType: 'spinbox',
showMeridiem: false
});

var begin = { hour: 6, minute: 20 };
var end = { hour: 11, minute: 15 };

tpSelectboxMeridiem.setRange(begin, end);

begin = { hour: 9, minute: 30 };
end = { hour: 18, minute: 40 };
tpSpinbox.setRange(begin, end);
</script>
</body>
</html>
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
};
Loading

0 comments on commit 0c926aa

Please sign in to comment.