Merge branch 'master' into production

Author: seonim-ryu

package.json

@@ -1,12 +1,12 @@
 {
   "name": "tui-code-snippet",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "TOAST UI Utility: CodeSnippet",
   "main": "dist/tui-code-snippet.js",
   "scripts": {
     "test": "karma start --no-single-run",
     "test:ne": "KARMA_SERVER=ne karma start",
-    "bundle": "webpack && webpack -p",
+    "bundle": "webpack & webpack -p --screw-ie8=false",
     "cpy-dist2doc": "mkdir -p doc/dist && cp -f -r dist doc",
     "doc": "jsdoc -c jsdoc.conf.json && npm run cpy-dist2doc"
   },

src/js/collection.js

@@ -108,7 +108,7 @@ function forEachOwnProperties(obj, iteratee, context) {
  * });
  * alert(sum); // 6
  *
- * // In case of Array-like object 
+ * // In case of Array-like object
  * var array = Array.prototype.slice.call(arrayLike); // change to array
  * util.forEach(array, function(value){
  *     sum += value;

src/js/defineClass.js

@@ -42,7 +42,7 @@ var extend = require('./object').extend;
  * var Child = util.defineClass(Parent, {
  *     childMethod: function() {}
  * });
- * 
+ *
  * Parent.staticMethod();
  *
  * var parentInstance = new Parent();

src/js/object.js

@@ -252,17 +252,19 @@ function isSameObject(x, y) { // eslint-disable-line complexity
 function pick(obj, paths) { // eslint-disable-line no-unused-vars
     var args = arguments;
     var target = args[0];
+    var i = 1;
     var length = args.length;
-    var i;
-    try {
-        for (i = 1; i < length; i += 1) {
-            target = target[args[i]];
+
+    for (; i < length; i += 1) {
+        if (type.isUndefined(target) ||
+            type.isNull(target)) {
+            return;
         }
 
-        return target;
-    } catch (e) {
-        return;// eslint-disable-line consistent-return, no-useless-return
+        target = target[args[i]];
     }
+
+    return target; // eslint-disable-line consistent-return
 }
 
 module.exports = {

test/object.test.js

@@ -128,6 +128,8 @@ describe('object', function() {
             expect(tui.util.pick(o2)).toBeNull();
             expect(tui.util.pick(o2, 'key1')).toBeUndefined();
             expect(tui.util.pick(o2, 'key1', 'key2')).toBeUndefined();
+            expect(tui.util.pick(o2, 'valueOf')).toBeUndefined();
+            expect(tui.util.pick(o2, 'toString')).toBeUndefined();
 
             expect(tui.util.pick(1)).toBe(1);
             expect(tui.util.pick('key1')).toBe('key1');
@@ -136,22 +138,31 @@ describe('object', function() {
         it('Object 인 경우', function() {
             var obj = {
                 'key1': 1,
+                'key2': null,
                 'nested': {
                     'key1': 11,
+                    'key2': null,
                     'nested': {
                         'key1': 21
                     }
                 }
             };
 
             expect(tui.util.pick(obj, 'key1')).toBe(1);
+            expect(tui.util.pick(obj, 'key1', 'notFound')).toBeUndefined();
+
             expect(tui.util.pick(obj, 'nested')).toEqual(obj.nested);
             expect(tui.util.pick(obj, 'nested', 'key1')).toBe(11);
             expect(tui.util.pick(obj, 'nested', 'nested')).toBe(obj.nested.nested);
             expect(tui.util.pick(obj, 'nested', 'nested', 'key1')).toBe(21);
 
             expect(tui.util.pick(obj, 'notFound')).toBeUndefined();
             expect(tui.util.pick(obj, 'notFound', 'notFound')).toBeUndefined();
+
+            expect(tui.util.pick(obj, 'key2')).toBeNull();
+            expect(tui.util.pick(obj, 'key2', 'key2')).toBeUndefined();
+            expect(tui.util.pick(obj, 'key2', 'valueOf')).toBeUndefined();
+            expect(tui.util.pick(obj, 'nested', 'key2')).toBeNull();
         });
 
         it('배열인 경우', function() {

webpack.config.js

@@ -1,3 +1,8 @@
+/**
+ * Configs file for bundling
+ * @author NHN Ent. FE Development Lab <dl_javascript@nhnent.com>
+ */
+
 'use strict';
 
 var pkg = require('./package.json');
@@ -7,6 +12,12 @@ var SafeUmdPlugin = require('safe-umd-webpack-plugin');
 
 var isProduction = process.argv.indexOf('-p') > -1;
 
+var uglifyJsPlugin = new webpack.optimize.UglifyJsPlugin({
+    compress: {
+        'properties': false
+    }
+});
+
 var FILENAME = pkg.name + (isProduction ? '.min.js' : '.js');
 var BANNER = [
     FILENAME,
@@ -15,7 +26,7 @@ var BANNER = [
     '@license ' + pkg.license
 ].join('\n');
 
-module.exports = {
+var config = {
     eslint: {
         failOnError: isProduction
     },
@@ -41,3 +52,9 @@ module.exports = {
         new webpack.BannerPlugin(BANNER)
     ]
 };
+
+if (isProduction) {
+    config.plugins.push(uglifyJsPlugin);
+}
+
+module.exports = config;