tui-calendar - npm Package Compare versions

Comparing version 1.4.0 to 1.5.0

bower.json

@@ -11,3 +11,3 @@ {
   ],
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "TOAST UI Calendar",
@@ -14,0 +14,0 @@ "ignore": [

package.json

 {
   "name": "tui-calendar",
   "author": "NHNEnt FE Development Lab <[e-mail]>",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "main": "dist/tui-calendar.js",
@@ -14,3 +14,3 @@ "license": "MIT",
     "nhnent",
-    "toast",    
+    "toast",
     "tui",
@@ -30,19 +30,21 @@ "component",
   "devDependencies": {
-    "css-loader": "^0.23.1",
-    "eslint": "^4.17.0",
+    "clean-webpack-plugin": "^0.1.19",
+    "css-loader": "^0.28.11",
+    "eslint": "^4.19.1",
     "eslint-config-tui": "^1.0.3",
-    "eslint-plugin-jasmine": "^2.9.2",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "handlebars": "^4.0.5",
-    "handlebars-template-loader": "^0.7.0",
-    "istanbul-instrumenter-loader": "^0.2.0",
-    "jasmine-core": "^2.4.1",
+    "eslint-loader": "^2.0.0",
+    "eslint-plugin-jasmine": "^2.10.1",
+    "extract-loader": "^2.0.1",
+    "handlebars": "^4.0.11",
+    "handlebars-template-loader": "^1.0.0",
+    "istanbul-instrumenter-loader": "^3.0.1",
+    "jasmine-core": "^2.99.1",
     "jsdoc": "^3.5.5",
-    "karma": "^1.5.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-coverage": "^1.1.1",
-    "karma-firefox-launcher": "^0.1.7",
+    "karma": "^2.0.2",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-cli": "^1.0.1",
+    "karma-coverage": "^1.1.2",
     "karma-fixture": "^0.2.6",
-    "karma-html2js-preprocessor": "^1.0.0",
-    "karma-jasmine": "^1.1.0",
+    "karma-html2js-preprocessor": "^1.1.0",
+    "karma-jasmine": "^1.1.2",
     "karma-jasmine-ajax": "^0.1.13",
@@ -52,17 +54,23 @@ "karma-jasmine-jquery": "^0.1.1",
     "karma-junit-reporter": "^1.2.0",
-    "karma-preprocess-preprocessor": "^0.1.1",
-    "karma-source-map-support": "^1.1.0",
+    "karma-preprocess-preprocessor": "^0.2.0",
+    "karma-sauce-launcher": "^1.2.0",
+    "karma-source-map-support": "^1.3.0",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.26",
+    "karma-spec-reporter": "0.0.32",
     "karma-webdriver-launcher": "git+https://github.com/nhnent/karma-webdriver-launcher.git#v1.1.0",
-    "karma-webpack": "^1.8.0",
-    "preprocess-loader": "^0.2.0",
-    "safe-umd-webpack-plugin": "0.0.2",
-    "style-loader": "^0.13.1",
-    "stylus": "^0.53.0",
-    "stylus-loader": "^2.1.2",
+    "karma-webpack": "^3.0.0",
+    "mini-css-extract-plugin": "^0.4.0",
+    "optimize-css-assets-webpack-plugin": "^4.0.2",
+    "preprocess-loader": "^0.2.2",
+    "safe-umd-webpack-plugin": "^4.0.0",
+    "style-loader": "^0.21.0",
+    "stylus": "^0.54.5",
+    "stylus-loader": "^3.0.2",
     "tui-jsdoc-template": "^1.2.2",
     "tui-release-notes": "git+https://github.com/nhnent/tui.release-notes.git",
-    "webpack": "1.14.0",
-    "webpack-dev-server": "1.16.3"
+    "uglifyjs-webpack-plugin": "^1.2.5",
+    "url-loader": "^1.0.1",
+    "webpack": "^4.13.0",
+    "webpack-cli": "^3.0.8",
+    "webpack-dev-server": "^3.1.4"
   },
@@ -72,4 +80,4 @@ "scripts": {
     "test:ne": "KARMA_SERVER=ne karma start",
-    "bundle": "webpack && NODE_ENV=production webpack -p",
-    "serve": "webpack-dev-server --progress --inline --hot",
+    "bundle": "webpack --mode development && NODE_ENV=production webpack --mode production",
+    "serve": "webpack-dev-server --mode development --progress --inline --hot",
     "cpy-dist2doc": "mkdir -p doc/dist && cp -f -r dist doc",
@@ -83,4 +91,4 @@ "doc": "jsdoc -c jsdoc.conf.json && npm run cpy-dist2doc",
     "tui-date-picker": "~3.0.0",
-    "tui-time-picker": "^1.0.0"
+    "tui-time-picker": "^1.4.0"
   }
 }

src/index.js

@@ -29,3 +29,3 @@ /**
 
-            instance = $.data(el, 'tuiCalendar');
+            instance = global.$.data(el, 'tuiCalendar');
 
@@ -38,3 +38,3 @@ if (instance) {
                 instance = new Calendar(el, options);
-                $.data(el, 'tuiCalendar', instance);
+                global.$.data(el, 'tuiCalendar', instance);
             }
@@ -41,0 +41,0 @@ }

src/js/common/datetime.js

@@ -110,2 +110,8 @@ /**
     /**
+     * The number of milliseconds 20 minutes for schedule min duration
+     * @type {number}
+     */
+    MILLISECONDS_SCHEDULE_MIN_DURATION: 20 * 60000,
+
+    /**
      * convert milliseconds
@@ -112,0 +118,0 @@ * @param {string} type - type of value.

src/js/controller/base.js

@@ -192,2 +192,10 @@ /**
 
+    if (options.location) {
+        schedule.set('location', options.location);
+    }
+
+    if (options.state) {
+        schedule.set('state', options.state);
+    }
+
     this._removeFromMatrix(schedule);
@@ -367,3 +375,3 @@ this._addToMatrix(schedule);
  * @property {string} color - text color when schedule is displayed
- * @property {string} bgColor - background color schedule is displayed 
+ * @property {string} bgColor - background color schedule is displayed
  * @property {string} borderColor - color of left border or bullet point when schedule is displayed
@@ -370,0 +378,0 @@ * @property {boolean} [checked] - whether to show calendar's schedules or not

src/js/controller/viewMixin/week.js

@@ -14,2 +14,4 @@ /* eslint no-shadow: 0 */
 
+var MILLISECONDS_SCHEDULE_MIN_DURATION = datetime.MILLISECONDS_SCHEDULE_MIN_DURATION;
+
 /**
@@ -119,4 +121,10 @@ * @mixin Base.Week
                     startTime = viewModel.getStarts().getTime();
-                    endTime = viewModel.getEnds().getTime() - 1;
+                    endTime = viewModel.getEnds().getTime();
 
+                    if (Math.abs(endTime - startTime) < MILLISECONDS_SCHEDULE_MIN_DURATION) {
+                        endTime += MILLISECONDS_SCHEDULE_MIN_DURATION;
+                    }
+
+                    endTime -= 1;
+
                     for (i = (col + 1); i < maxRowLength; i += 1) {
@@ -123,0 +131,0 @@ hasCollide = Week.hasCollide(binaryMap[i - 1], startTime, endTime);

src/js/factory/calendar.js

@@ -403,2 +403,6 @@ /**
 
+    util.forEach(this._options.calendars || [], function(calendar) {
+        this.setCalendarColor(calendar.id, calendar, true);
+    }, this);
+
     // set by primary timezone
@@ -913,3 +917,3 @@ if (timezones.length) {
 
-    if (silent) {
+    if (!silent) {
         this.render();
@@ -916,0 +920,0 @@ }

src/js/model/schedule.js

@@ -167,2 +167,8 @@ /* eslint complexity: 0 */
     /**
+     * state. 'Busy' is default.
+     * @type {string}
+     */
+    this.state = '';
+
+    /**
      * Separate data storage space independent of rendering.
@@ -169,0 +175,0 @@ * @type {object}

src/js/model/viewModel/scheduleViewModel.js

@@ -8,3 +8,6 @@ /**
 var util = require('tui-code-snippet');
+var datetime = require('../../common/datetime');
 
+var MILLISECONDS_SCHEDULE_MIN_DURATION = datetime.MILLISECONDS_SCHEDULE_MIN_DURATION;
+
 /**
@@ -185,2 +188,6 @@ * Schedule ViewModel
 
+    if (Math.abs(start - ownStarts) < MILLISECONDS_SCHEDULE_MIN_DURATION) {
+        return true;
+    }
+
     return false;
@@ -187,0 +194,0 @@ };

src/js/view/popup/scheduleCreationPopup.js

@@ -160,3 +160,3 @@ /**
  * @param {HTMLElement} target click event target
- * @returns {boolean} whether 
+ * @returns {boolean} whether
  */
@@ -291,5 +291,5 @@ ScheduleCreationPopup.prototype._selectDropdownMenuItem = function(target) {
                 title: title.value,
+                location: location.value,
                 raw: {
-                    class: isPrivate ? 'private' : 'public',
-                    location: location.value
+                    class: isPrivate ? 'private' : 'public'
                 },
@@ -317,5 +317,5 @@ start: start,
             title: title.value,
+            location: location.value,
             raw: {
-                class: isPrivate ? 'private' : 'public',
-                location: location.value
+                class: isPrivate ? 'private' : 'public'
             },
@@ -384,3 +384,3 @@ start: new TZDate(startDate),
     isPrivate = raw['class'] === 'private';
-    location = raw.location;
+    location = schedule.location;
     startDate = schedule.start;
@@ -409,4 +409,3 @@ endDate = schedule.end;
         raw: {
-            location: location,
-            'class': isPrivate ? 'private' : 'public'
+            class: isPrivate ? 'private' : 'public'
         },
@@ -413,0 +412,0 @@ zIndex: this.layer.zIndex + 5,

New alerts

Uses eval

Supply chain risk

Package uses eval() which is a dangerous function. This prevents the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 2 instances in 1 package

Improved metrics

Lines of code

39174

increased by1.44%

Worsened metrics

Total package byte prevSize

4265330

decreased by-17.08%

Dev dependency count

44

increased by22.22%

Number of medium supply chain risk alerts

4

increased byInfinity%

Dependency changes

• Updatedtui-time-picker@^1.4.0