Merge pull request #381 from seogi1004/develop

v1.4.2 릴리즈
juijs · Nov 17, 2015 · c757e2c · c757e2c
2 parents 7fc47c6 + 85d60fe
commit c757e2c
Show file tree

Hide file tree

Showing 163 changed files with 17,691 additions and 4,856 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -11,6 +11,7 @@ module.exports = function(grunt) {
 
         // util
         "js/util/math.js",
+        "js/util/transform.js",
         "js/util/time.js",
         "js/util/scale.js",
         "js/util/color.js",
@@ -23,13 +24,18 @@ module.exports = function(grunt) {
         "js/ui/button.js",
         "js/ui/combo.js",
         "js/ui/datepicker.js",
+        "js/ui/colorpicker.js",
         "js/ui/dropdown.js",
         "js/ui/modal.js",
         "js/ui/notify.js",
         "js/ui/paging.js",
         "js/ui/tooltip.js",
         "js/ui/layout.js",
         "js/ui/accordion.js",
+        "js/ui/switch.js",
+        "js/ui/slider.js",
+        "js/ui/progress.js",
+        "js/ui/colorpicker.js",
 
         "js/uix/autocomplete.js",
         "js/uix/tab.js",
@@ -66,8 +72,17 @@ module.exports = function(grunt) {
 
         // chart.icon
         "js/chart/icon/jennifer.js",
-
+
+        // chart.polygon
+        "js/chart/polygon/core.js",
+        "js/chart/polygon/face.js",
+        "js/chart/polygon/line.js",
+        "js/chart/polygon/point.js",
+        "js/chart/polygon/cube.js",
+
         // chart.grid
+        "js/chart/grid/draw2d.js",
+        "js/chart/grid/draw3d.js",
         "js/chart/grid/core.js",
         "js/chart/grid/block.js",
         "js/chart/grid/date.js",
@@ -147,6 +162,11 @@ module.exports = function(grunt) {
         "js/chart/brush/map.marker.js",
         "js/chart/brush/map.weather.js",
 
+        // polygon brush (full 3d)
+        "js/chart/brush/polygon.core.js",
+        "js/chart/brush/polygon.scatter.js",
+        "js/chart/brush/polygon.column.js",
+
         // chart.widget
         "js/chart/widget/core.js",
         "js/chart/widget/tooltip.js",
@@ -165,6 +185,10 @@ module.exports = function(grunt) {
         "js/chart/widget/map.control.js",
         "js/chart/widget/map.tooltip.js",
 
+        // polygon widget (full 3d)
+        "js/chart/widget/polygon.core.js",
+        "js/chart/widget/polygon.rotate.js",
+
         // chart wrapper
         "js/chartx/realtime.js",
         "js/chartx/mini.js"

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jui",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "main": "jui.min.js",
   "ignore": [
     ".jshintrc",