v4.0.4

Author: Portugal, Marcelo

CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="v4.0.4"></a>
+### v4.0.4 (2017-04-04)
+
+
+#### Bug Fixes
+
+* **6123:** Allowing selection and tree-base to build columns. ([2ea9a06e](http://github.com/angular-ui/ng-grid/commit/2ea9a06e594601cc44947a997f08bce628e813f4))
+* **flatEntityAccess:**  getCellDisplayValue now returns the correct value. ([ba77c875](http://github.com/angular-ui/ng-grid/commit/ba77c8750431236ff4f729fe8a77eb44cbbfc9b7))
+
+
+#### Features
+
+* **japanese:** Update japanese translation. ([47e78d1](https://github.com/angular-ui/ui-grid/commit/47e78d16710a96033c692f800c5bb4874f694fc8))
+
 <a name="v4.0.3"></a>
 ### v4.0.3 (2017-03-24)
 

bower.json

@@ -2,20 +2,12 @@
   "name": "angular-ui-grid",
   "description": "A data grid for Angular",
   "main": [
-    "3.2.11",
-    "less",
-    "ui-grid.css",
-    "ui-grid.eot",
-    "ui-grid.js",
-    "ui-grid.min.css",
-    "ui-grid.min.js",
-    "ui-grid.svg",
-    "ui-grid.ttf",
-    "ui-grid.woff"
+    "./ui-grid.css",
+    "./ui-grid.js"
   ],
   "ignore": [],
   "dependencies": {
-    "angular": ">=1.2.16 1.4.x"
+    "angular": ">=1.4.0 1.5.x"
   },
   "repository": {
     "type": "git",

less/body.less

@@ -18,10 +18,6 @@
   overflow-y: scroll;
   -webkit-overflow-scrolling: touch;
 
-  // overflow-anchor is a new feature/bug in chrome 56. See https://www.chromestatus.com/feature/5700102471548928
-  // It causes ui-grid-viewport to scroll indefinitely. See https://github.com/angular-ui/ui-grid/issues/6017
-  overflow-anchor: none;
-
   &:focus {
     outline: none !important;
   }
@@ -35,6 +31,7 @@
 .ui-grid-row {
   //position: absolute;
   // border-bottom: 1px solid @borderColor;
+  clear: both; //prevent columns mixing after expand
 
   &:nth-child(odd) .ui-grid-cell {
     background-color: @rowColorOdd; //rgb(253, 253, 253);
@@ -77,4 +74,4 @@
     right: 0;
     opacity: 0.66;
   }
-}
+}

less/icons.less

@@ -2,12 +2,13 @@
   font-family: 'ui-grid';
   src: url('@{font-path}ui-grid.eot');
   src: url('@{font-path}ui-grid.eot#iefix') format('embedded-opentype'),
-       url('@{font-path}ui-grid.woff') format('woff'),
-       url('@{font-path}ui-grid.ttf') format('truetype'),
-       url('@{font-path}ui-grid.svg?#ui-grid') format('svg');
+  url('@{font-path}ui-grid.woff') format('woff'),
+  url('@{font-path}ui-grid.ttf') format('truetype'),
+  url('@{font-path}ui-grid.svg?#ui-grid') format('svg');
   font-weight: normal;
   font-style: normal;
 }
+
 /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
 /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
 /*
@@ -18,34 +19,34 @@
   }
 }
 */
- 
- [class^="ui-grid-icon"]:before, [class*=" ui-grid-icon"]:before {
+
+[class^="ui-grid-icon"]:before, [class*=" ui-grid-icon"]:before {
   font-family: "ui-grid";
   font-style: normal;
   font-weight: normal;
   speak: none;
- 
+
   display: inline-block;
   text-decoration: inherit;
   width: 1em;
   margin-right: .2em;
   text-align: center;
   /* opacity: .8; */
- 
+
   /* For safety - reset parent styles, that can break glyph codes*/
   font-variant: normal;
   text-transform: none;
-     
+
   /* fix buttons height, for twitter bootstrap */
   line-height: 1em;
- 
+
   /* Animation center compensation - margins should be symmetric */
   /* remove if not needed */
   margin-left: .2em;
- 
+
   /* you can be more comfortable with increased icons size */
   /* font-size: 120%; */
- 
+
   /* Uncomment for 3D effect */
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
@@ -54,3 +55,95 @@
   width: 1em;
   content: ' ';
 }
+
+.ui-grid-icon-plus-squared:before {
+  content: '\c350'
+}
+
+.ui-grid-icon-minus-squared:before {
+  content: '\c351'
+}
+
+.ui-grid-icon-search:before {
+  content: '\c352'
+}
+
+.ui-grid-icon-cancel:before {
+  content: '\c353'
+}
+
+.ui-grid-icon-info-circled:before {
+  content: '\c354'
+}
+
+.ui-grid-icon-lock:before {
+  content: '\c355'
+}
+
+.ui-grid-icon-lock-open:before {
+  content: '\c356'
+}
+
+.ui-grid-icon-pencil:before {
+  content: '\c357'
+}
+
+.ui-grid-icon-down-dir:before {
+  content: '\c358'
+}
+
+.ui-grid-icon-up-dir:before {
+  content: '\c359'
+}
+
+.ui-grid-icon-left-dir:before {
+  content: '\c35a'
+}
+
+.ui-grid-icon-right-dir:before {
+  content: '\c35b'
+}
+
+.ui-grid-icon-left-open:before {
+  content: '\c35c'
+}
+
+.ui-grid-icon-right-open:before {
+  content: '\c35d'
+}
+
+.ui-grid-icon-angle-down:before {
+  content: '\c35e'
+}
+
+.ui-grid-icon-filter:before {
+  content: '\c35f'
+}
+
+.ui-grid-icon-sort-alt-up:before {
+  content: '\c360'
+}
+
+.ui-grid-icon-sort-alt-down:before {
+  content: '\c361'
+}
+
+.ui-grid-icon-ok:before {
+  content: '\c362'
+}
+
+.ui-grid-icon-menu:before {
+  content: '\c363'
+}
+
+.ui-grid-icon-indent-left:before {
+  content: '\e800'
+}
+
+.ui-grid-icon-indent-right:before {
+  content: '\e801'
+}
+
+.ui-grid-icon-spin5:before {
+  content: '\ea61'
+}

less/menu.less

@@ -38,20 +38,6 @@
 
   .rounded(@gridBorderRadius);
   .box-shadow(e("0 10px 20px rgba(0, 0, 0, 0.2), inset 0 12px 12px -14px rgba(0, 0, 0, 0.2)"));
-
-  // Small hidden close button that only appears when focused.
-  .ui-grid-menu-close-button {
-    position: absolute;
-    right: 0px;
-    top: 0px;
-    #ui-grid-twbs > .btn();
-    #ui-grid-twbs > .button-size(1px; 1px; 10px; 1; 2px);
-    #ui-grid-twbs > .button-variant(transparent, transparent, transparent);
-    > i {
-      opacity: 0.75;
-      color: black;
-    }
-  }
 }
 
 .ui-grid-menu .ui-grid-menu-inner ul {

package.json

@@ -1,10 +1,10 @@
 {
   "name": "angular-ui-grid",
   "description": "A data grid for Angular",
-  "main": "ui-grid.js",
+  "main": "index.js",
   "ignore": [],
   "dependencies": {
-    "angular": ">=1.2.16 1.4.x"
+    "angular": ">=1.4.0 1.5.x"
   },
   "repository": {
     "type": "git",
@@ -27,9 +27,8 @@
     "data grid"
   ],
   "license": "MIT",
-  "version": "3.2.11",
+  "version": "4.0.4",
   "files": [
-    "3.2.11",
     "less",
     "ui-grid.css",
     "ui-grid.eot",