-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Dongsik Yoo
committed
Apr 24, 2018
1 parent
c6133a0
commit 70ec226
Showing
8 changed files
with
34 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/*! | ||
* tui-calendar | ||
* @version 1.0.1 | Mon Apr 23 2018 | ||
* @version 1.0.2 | Tue Apr 24 2018 | ||
* @author NHNEnt FE Development Lab <[email protected]> | ||
* @license undefined | ||
*/ | ||
|
@@ -98,6 +98,7 @@ return /******/ (function(modules) { // webpackBootstrap | |
var datetime = __webpack_require__(27); | ||
var common = __webpack_require__(30); | ||
var config = __webpack_require__(34); | ||
var mmax = Math.max; | ||
|
||
/** | ||
* Get CSS syntax for element size | ||
|
@@ -320,7 +321,7 @@ return /******/ (function(modules) { // webpackBootstrap | |
}, | ||
|
||
'getRight': function(a, b) { | ||
return 100 - (a + b); | ||
return mmax(0, 100 - (a + b)); | ||
}, | ||
|
||
/** | ||
|
@@ -5583,12 +5584,15 @@ return /******/ (function(modules) { // webpackBootstrap | |
* @example | ||
* cal.setTheme({ | ||
'month.dayname.height': '31px', | ||
'month.dayname.borderTop': '1px solid #e5e5e5', | ||
'month.dayname.borderBottom': '1px solid #e5e5e5', | ||
'common.dayname.color': '#333', | ||
'month.dayname.borderBottom': '1px solid #e5e5e5' // Not valid key will be return. | ||
* }); | ||
*/ | ||
Calendar.prototype.setTheme = function(theme) { | ||
return this._controller.setTheme(theme); | ||
var result = this._controller.setTheme(theme); | ||
this.changeView(this.getViewName(), true); | ||
|
||
return result; | ||
}; | ||
|
||
/** | ||
|
@@ -7767,6 +7771,14 @@ return /******/ (function(modules) { // webpackBootstrap | |
} | ||
}, this); | ||
|
||
// apply missing styles which have to be default | ||
util.forEach(themeConfig, function(style, key) { | ||
if (!this.getStyle(key)) { | ||
this._map.set(key, style); | ||
common.set(this, key, style); | ||
} | ||
}, this); | ||
|
||
return errors; | ||
}; | ||
|
||
|
@@ -7825,8 +7837,8 @@ return /******/ (function(modules) { // webpackBootstrap | |
'month.dayname.borderLeft': 'none', | ||
'month.dayname.paddingLeft': '10px', | ||
'month.dayname.paddingRight': '0', | ||
'month.dayname.fontSize': '12px', | ||
'month.dayname.backgroundColor': 'inherit', | ||
'month.dayname.fontSize': '12px', | ||
'month.dayname.fontWeight': 'normal', | ||
'month.dayname.textAlign': 'left', | ||
|
||
|
@@ -7941,7 +7953,6 @@ return /******/ (function(modules) { // webpackBootstrap | |
|
||
// month header 'dayname' | ||
'month.dayname.height': '31px', | ||
'month.dayname.borderTop': '1px solid #e5e5e5', | ||
'month.dayname.borderLeft': '1px solid #e5e5e5', | ||
'month.dayname.paddingLeft': '10px', | ||
'month.dayname.paddingRight': '10px', | ||
|
@@ -8030,17 +8041,16 @@ return /******/ (function(modules) { // webpackBootstrap | |
'common.border': '1px solid #e5e5e5', | ||
'common.backgroundColor': 'white', | ||
'common.holiday.color': '#ff4040', | ||
'common.saturday.color': '#135de6', | ||
'common.saturday.color': '#333', | ||
'common.dayname.color': '#333', | ||
'common.today.color': '#135de6', | ||
'common.today.color': '#333', | ||
|
||
// creation guide style | ||
'common.creationGuide.backgroundColor': 'rgba(81, 92, 230, 0.05)', | ||
'common.creationGuide.border': '1px solid #515ce6', | ||
|
||
// month header 'dayname' | ||
'month.dayname.height': '31px', | ||
'month.dayname.borderTop': '1px solid #e5e5e5', | ||
'month.dayname.borderLeft': '1px solid #e5e5e5', | ||
'month.dayname.paddingLeft': '10px', | ||
'month.dayname.paddingRight': '10px', | ||
|
@@ -10069,7 +10079,9 @@ return /******/ (function(modules) { // webpackBootstrap | |
* @param {number} maxHeight - maxHeight | ||
*/ | ||
VPanel.prototype.setMaxHeight = function(maxHeight) { | ||
this.options.maxHeight = maxHeight; | ||
if (!this.options.autoHeight) { | ||
this.options.maxHeight = maxHeight; | ||
} | ||
}; | ||
|
||
/** | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"name": "tui-calendar", | ||
"author": "NHNEnt FE Development Lab <[email protected]>", | ||
"version": "1.0.1", | ||
"version": "1.0.2", | ||
"main": "dist/tui-calendar.js", | ||
"license:": "MIT", | ||
"description": "TOAST UI Calendar", | ||
|