chore(release): 1.0.0-beta.3 distribution files

esvit · Sep 5, 2015 · 15e66b7 · 15e66b7
1 parent e290293
commit 15e66b7
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+<a name="1.0.0-beta.3"></a>
+# 1.0.0-beta.3 (2015-09-06)
+
+
+## Bug Fixes
+
+- **NgTableParams:** thisArg for apply on $log functions should be $log
+  ([f8e0a9de](https://github.com/esvit/ng-table/commit/f8e0a9dea32ef0f73b8cf19e9928656a230d9935))
+- **groupRow:** should update as group changes externally
+  ([7d2965c5](https://github.com/esvit/ng-table/commit/7d2965c5bc220ec4483059cf87c6256d98132d77))
+
+
+## Features
+
+- **groupRow:** add expand/collapse toggle for group rows
+  ([32f208b2](https://github.com/esvit/ng-table/commit/32f208b2bd137d57a9e91bc4c5a7e5bd2ef5c862))
+- **ngTableColumnsBinding:** new directive that provide access to the $columns array
+  ([e290293c](https://github.com/esvit/ng-table/commit/e290293c7cb649591ebb78d92199d164bb3f8490))
+
+
 <a name="1.0.0-beta.2"></a>
 # 1.0.0-beta.2 (2015-09-02)
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-table",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "main": [
     "./dist/ng-table.min.js",
     "./dist/ng-table.min.css"

diff --git a/dist/ng-table.css b/dist/ng-table.css
@@ -89,9 +89,13 @@
 .ng-table .ng-table-group-selector {
   display: block;
 }
-.ng-table .ng-table-group-selector > button {
+.ng-table .ng-table-group-close,
+.ng-table .ng-table-group-toggle {
   float: right;
 }
+.ng-table .ng-table-group-toggle {
+  margin-right: 5px;
+}
 .ng-table + .pagination {
   margin-top: 0;
 }

diff --git a/dist/ng-table.js b/dist/ng-table.js
@@ -542,7 +542,7 @@
                 isCommittedDataset = false,
                 log = function() {
                     if (settings.debugMode && $log.debug) {
-                        $log.debug.apply(this, arguments);
+                        $log.debug.apply($log, arguments);
                     }
                 },
                 defaultFilterOptions = {
@@ -1731,6 +1731,50 @@
     }]);
 })();
 
+/**
+ * ngTable: Table + Angular JS
+ *
+ * @author Vitalii Savchuk <esvit666@gmail.com>
+ * @url https://github.com/esvit/ng-table/
+ * @license New BSD License <http://creativecommons.org/licenses/BSD/>
+ */
+
+(function(){
+    'use strict';
+
+    angular.module('ngTable')
+        .directive('ngTableColumnsBinding', ngTableColumnsBinding);
+
+    ngTableColumnsBinding.$inject = ["$parse"];
+
+    /**
+     * @ngdoc service
+     * @name ngTableColumnsBinding
+     * @description One-way data binds the $columns array generated by ngTable/ngTableDynamic to the specified
+     * expression.
+     *
+     * This allows the $columns array to be accessed outside of the html table markup
+     */
+    function ngTableColumnsBinding($parse){
+        var directive = {
+            restrict: 'A',
+            require: 'ngTable',
+            link: linkFn
+        };
+        return directive;
+
+        function linkFn($scope, $element, $attrs){
+            var setter = $parse($attrs.ngTableColumnsBinding).assign;
+            if (setter){
+                $scope.$watch('$columns', function(newColumns){
+                    var shallowClone = (newColumns || []).slice(0);
+                    setter($scope, shallowClone);
+                });
+            }
+        }
+    }
+})();
+
 /**
  * ngTable: Table + Angular JS
  *
@@ -1879,6 +1923,7 @@
             $scope.getVisibleColumns = getVisibleColumns;
             $scope.groupBy = groupBy;
             $scope.isSelectedGroup = isSelectedGroup;
+            $scope.toggleDetail = toggleDetail;
 
             $scope.$watch('params.group()', setGroup, true);
         }
@@ -1922,14 +1967,7 @@
             if (isSelectedGroup(group)){
                 changeSortDirection();
             } else {
-                var existingGroupCol = findGroupColumn($scope.$selGroup);
-                if (existingGroupCol && existingGroupCol.show.assign){
-                    existingGroupCol.show.assign($scope, true);
-                }
                 if (group.groupable){
-                    if (group.show.assign){
-                        group.show.assign($scope, false);
-                    }
                     $scope.params.group(group.groupable($scope));
                 } else{
                     $scope.params.group(group);
@@ -1946,6 +1984,10 @@
         }
 
         function setGroup(group){
+            var existingGroupCol = findGroupColumn($scope.$selGroup);
+            if (existingGroupCol && existingGroupCol.show.assign){
+                existingGroupCol.show.assign($scope, true);
+            }
             if (angular.isFunction(group)) {
                 groupFns = [group];
                 $scope.$selGroup = group;
@@ -1957,9 +1999,17 @@
                 if (groupedColumn) {
                     $scope.$selGroupTitle = groupedColumn.title($scope);
                     $scope.$selGroup = groupKey;
+                    if (groupedColumn.show.assign) {
+                        groupedColumn.show.assign($scope, false);
+                    }
                 }
             }
         }
+
+        function toggleDetail(){
+            $scope.params.settings().groupOptions.isExpanded = !$scope.params.settings().groupOptions.isExpanded;
+            return $scope.params.reload();
+        }
     }
 })();
 
@@ -2148,7 +2198,7 @@ angular.module('ngTable').run(['$templateCache', function ($templateCache) {
 	$templateCache.put('ng-table/filters/select-multiple.html', '<select ng-options="data.id as data.title for data in $column.data" ng-disabled="$filterRow.disabled" multiple ng-multiple="true" ng-model="params.filter()[name]" class="filter filter-select-multiple form-control" name="{{name}}"> </select> ');
 	$templateCache.put('ng-table/filters/select.html', '<select ng-options="data.id as data.title for data in $selectData" ng-table-select-filter-ds="$column" ng-disabled="$filterRow.disabled" ng-model="params.filter()[name]" class="filter filter-select form-control" name="{{name}}"> <option style="display:none" value=""></option> </select> ');
 	$templateCache.put('ng-table/filters/text.html', '<input type="text" name="{{name}}" ng-disabled="$filterRow.disabled" ng-model="params.filter()[name]" class="input-filter form-control" placeholder="{{getFilterPlaceholderValue(filter, name)}}"/> ');
-	$templateCache.put('ng-table/groupRow.html', '<tr ng-if="params.hasGroup()" ng-show="$groupRow.show" class="ng-table-group-header"> <th colspan="{{getVisibleColumns().length}}" class="sortable" ng-class="{ \'sort-asc\': params.hasGroup($selGroup, \'asc\'), \'sort-desc\':params.hasGroup($selGroup, \'desc\') }"> <a href="" ng-click="isSelectorOpen=!isSelectorOpen" class="ng-table-group-selector"> <strong class="sort-indicator">{{$selGroupTitle}}</strong> <button class="btn btn-default btn-xs" ng-click="$groupRow.show=false" ng-disabled="isSelectorOpen"><span class="glyphicon glyphicon-resize-small"></span> </button> </a> <div class="list-group" ng-if="isSelectorOpen"> <a href="" class="list-group-item" ng-repeat="group in getGroupables()" ng-click="groupBy(group)"> <strong>{{ getGroupTitle(group)}}</strong> <strong ng-class="isSelectedGroup(group) && \'sort-indicator\'"></strong> </a> </div> </th> </tr> ');
+	$templateCache.put('ng-table/groupRow.html', '<tr ng-if="params.hasGroup()" ng-show="$groupRow.show" class="ng-table-group-header"> <th colspan="{{getVisibleColumns().length}}" class="sortable" ng-class="{ \'sort-asc\': params.hasGroup($selGroup, \'asc\'), \'sort-desc\':params.hasGroup($selGroup, \'desc\') }"> <a href="" ng-click="isSelectorOpen=!isSelectorOpen" class="ng-table-group-selector"> <strong class="sort-indicator">{{$selGroupTitle}}</strong> <button class="btn btn-default btn-xs ng-table-group-close" ng-click="$groupRow.show=false; $event.preventDefault(); $event.stopPropagation();"> <span class="glyphicon glyphicon-remove"></span> </button> <button class="btn btn-default btn-xs ng-table-group-toggle" ng-click="toggleDetail(); $event.preventDefault(); $event.stopPropagation();"> <span class="glyphicon" ng-class="{ \'glyphicon-resize-small\': params.settings().groupOptions.isExpanded, \'glyphicon-resize-full\': !params.settings().groupOptions.isExpanded }"></span> </button> </a> <div class="list-group" ng-if="isSelectorOpen"> <a href="" class="list-group-item" ng-repeat="group in getGroupables()" ng-click="groupBy(group)"> <strong>{{ getGroupTitle(group)}}</strong> <strong ng-class="isSelectedGroup(group) && \'sort-indicator\'"></strong> </a> </div> </th> </tr> ');
 	$templateCache.put('ng-table/header.html', '<ng-table-group-row></ng-table-group-row> <ng-table-sorter-row></ng-table-sorter-row> <ng-table-filter-row></ng-table-filter-row> ');
 	$templateCache.put('ng-table/pager.html', '<div class="ng-cloak ng-table-pager" ng-if="params.data.length"> <div ng-if="params.settings().counts.length" class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul ng-if="pages.length" class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active && !page.current, \'active\': page.current}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)" href="">&laquo;</a> <a ng-switch-when="first" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)" href="">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)" href="">&raquo;</a> </li> </ul> </div> ');
 	$templateCache.put('ng-table/sorterRow.html', '<tr class="ng-table-sort-header"> <th title="{{$column.headerTitle(this)}}" ng-repeat="$column in $columns" ng-class="{ \'sortable\': $column.sortable(this), \'sort-asc\': params.sorting()[$column.sortable(this)]==\'asc\', \'sort-desc\': params.sorting()[$column.sortable(this)]==\'desc\' }" ng-click="sortBy($column, $event)" ng-if="$column.show(this)" ng-init="template=$column.headerTemplateURL(this)" class="header {{$column.class(this)}}"> <div ng-if="!template" class="ng-table-header" ng-class="{\'sort-indicator\': params.settings().sortingIndicator==\'div\'}"> <span ng-bind="$column.title(this)" ng-class="{\'sort-indicator\': params.settings().sortingIndicator==\'span\'}"></span> </div> <div ng-if="template" ng-include="template"></div> </th> </tr> ');

diff --git a/dist/ng-table.less b/dist/ng-table.less
@@ -96,9 +96,12 @@
     }
     .ng-table-group-selector {
         display: block;
-        > button {
-            float: right;
-        }
+    }
+    .ng-table-group-close, .ng-table-group-toggle {
+        float: right;
+    }
+    .ng-table-group-toggle {
+        margin-right: 5px;
     }
     & + .pagination {
         margin-top: 0;

diff --git a/dist/ng-table.min.css b/dist/ng-table.min.css
diff --git a/dist/ng-table.min.js b/dist/ng-table.min.js
diff --git a/dist/ng-table.min.js.map b/dist/ng-table.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-table",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "author": "Vitalii Savchuk <esvit666@gmail.com>",
   "license": "BSD",
   "repository": {