Merge branch 'master' into production

nhn · Sep 8, 2017 · 4a345ae · 4a345ae
2 parents d738889 + 7a4bf21
commit 4a345ae
Show file tree

Hide file tree

Showing 29 changed files with 1,018 additions and 91 deletions.
diff --git a/examples/example04-input-types.html b/examples/example04-input-types.html
@@ -95,6 +95,9 @@
                     { text: 'etc.', value: '5' }
                 ],
                 useViewMode: true
+            },
+            copyOptions: {
+                useListItemText: true // when this option is used, the copy value is concatenated text
             }
         },
         {
@@ -106,6 +109,9 @@
             onAfterChange: function(ev){
                 console.log('After change:' + ev);
             },
+            copyOptions: {
+                useListItemText: true
+            },
             editOptions: {
                 type: 'radio',
                 listItems: [

diff --git a/karma.conf.js b/karma.conf.js
@@ -20,25 +20,25 @@ function setConfig(defaultConfig, server) {
                 base: 'WebDriver',
                 config: webdriverConfig,
                 browserName: 'internet explorer',
-                version: 8
+                version: '8'
             },
             'IE9': {
                 base: 'WebDriver',
                 config: webdriverConfig,
                 browserName: 'internet explorer',
-                version: 9
+                version: '9'
             },
             'IE10': {
                 base: 'WebDriver',
                 config: webdriverConfig,
                 browserName: 'internet explorer',
-                version: 10
+                version: '10'
             },
             'IE11': {
                 base: 'WebDriver',
                 config: webdriverConfig,
                 browserName: 'internet explorer',
-                version: 11
+                version: '11'
             },
             'Chrome-WebDriver': {
                 base: 'WebDriver',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tui-grid",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "TOAST UI Grid : Powerful data grid control supported by TOAST UI",
   "main": "dist/tui-grid.js",
   "scripts": {

diff --git a/performance/data/data.js b/performance/data/data.js