Skip to content
This repository has been archived by the owner on Feb 2, 2025. It is now read-only.

Commit

Permalink
Merge branch 'teraone-dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
l-lin committed Sep 2, 2015
2 parents bc53c96 + 8193fe9 commit cfaaef8
Show file tree
Hide file tree
Showing 19 changed files with 715 additions and 56 deletions.
114 changes: 58 additions & 56 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,60 @@
{
"name": "angular-datatables",
"version": "0.5.0",
"author": "l-lin",
"license": "MIT",
"main": [
"dist/angular-datatables.js",
"dist/plugins/bootstrap/angular-datatables.bootstrap.js",
"dist/plugins/bootstrap/datatables.bootstrap.css",
"dist/plugins/colreorder/angular-datatables.colreorder.js",
"dist/plugins/columnfilter/angular-datatables.columnfilter.js",
"dist/plugins/colvis/angular-datatables.colvis.js",
"dist/plugins/fixedcolumns/angular-datatables.fixedcolumns.js",
"dist/plugins/fixedheader/angular-datatables.fixedheader.js",
"dist/plugins/scroller/angular-datatables.scroller.js",
"dist/plugins/tabletools/angular-datatables.tabletools.js"
],
"ignore": [
".bowerrc",
".editorconfig",
".git*",
".jshintrc",
".esformatter",
"Gruntfile.js",
"test",
"node_modules",
"src",
".travis.yml",
"vendor",
"data.json",
"data1.json",
"demo",
"favicon.png",
"index.html",
"README.md",
"CONTRIBUTING.md",
"server.js",
"styles",
"_config.yml",
"grunt",
"images",
"package.json",
"archives",
"archives.json",
"dtOptions.json",
"dtColumns.json"
],
"dependencies": {
"angular": ">=1.3.0",
"jquery": ">=1.11.0",
"datatables": ">=1.10.0"
},
"devDependencies": {
"angular-mocks": ">=1.3.0",
"bootstrap": ">=3.0.1",
"angular-bootstrap": ">=0.10.0"
}
"name": "angular-datatables",
"version": "0.5.0",
"author": "l-lin",
"license": "MIT",
"main": [
"dist/angular-datatables.js",
"dist/plugins/bootstrap/angular-datatables.bootstrap.js",
"dist/plugins/bootstrap/datatables.bootstrap.css",
"dist/plugins/colreorder/angular-datatables.colreorder.js",
"dist/plugins/columnfilter/angular-datatables.columnfilter.js",
"dist/plugins/light-columnfilter/angular-datatables.light-columnfilter.js",
"dist/plugins/colvis/angular-datatables.colvis.js",
"dist/plugins/fixedcolumns/angular-datatables.fixedcolumns.js",
"dist/plugins/fixedheader/angular-datatables.fixedheader.js",
"dist/plugins/scroller/angular-datatables.scroller.js",
"dist/plugins/tabletools/angular-datatables.tabletools.js"
],
"ignore": [
".bowerrc",
".editorconfig",
".git*",
".jshintrc",
".esformatter",
"Gruntfile.js",
"test",
"node_modules",
"src",
".travis.yml",
"vendor",
"data.json",
"data1.json",
"demo",
"favicon.png",
"index.html",
"README.md",
"CONTRIBUTING.md",
"server.js",
"styles",
"_config.yml",
"grunt",
"images",
"package.json",
"archives",
"archives.json",
"dtOptions.json",
"dtColumns.json"
],
"dependencies": {
"angular": ">=1.3.0",
"datatables": ">=1.10.0",
"datatables-light-columnfilter": "~0.0.7",
"jquery": ">=1.11.0"
},
"devDependencies": {
"angular-mocks": ">=1.3.0",
"bootstrap": ">=3.0.1",
"angular-bootstrap": ">=0.10.0"
}
}
1 change: 1 addition & 0 deletions demo/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ angular.module('showcase', [
'showcase.withAngularTranslate',
'showcase.withColReorder',
'showcase.withColumnFilter',
'showcase.withLightColumnFilter',
'showcase.withColVis',
'showcase.withResponsive',
'showcase.withScroller',
Expand Down
1 change: 1 addition & 0 deletions demo/partials/gettingStarted.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ <h3>Dependencies</h3>
<li><a href="https://datatables.net/extras/colvis/">ColVis</a> with version 1.1.0+</li>
<li><a href="https://datatables.net/extras/tabletools/">TableTools</a> with version 2.2.0+</li>
<li><a href="http://jquery-datatables-column-filter.googlecode.com/svn/trunk/index.html">ColumnFilter</a> with version 1.5.6</li>
<li><a href="https://github.com/thansen-solire/datatables-light-columnfilter/">LightColumnFilter</a> with version 0.0.7</li>
<li><a href="https://datatables.net/extensions/fixedcolumns/">FixedColumns</a> with version 3.0.2</li>
<li><a href="https://datatables.net/extensions/fixedheader/">FixedHeader</a> with version 2.1.2</li>
<li><a href="https://datatables.net/extensions/responsive/">Responsive</a> with version 1.0.1</li>
Expand Down
3 changes: 3 additions & 0 deletions demo/usages.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ angular.module('showcase.usages', ['ngResource'])
}, {
name: 'withColumnFilter',
label: 'With Column Filter'
}, {
name: 'withLightColumnFilter',
label: 'With Light Column Filter'
},{
name: 'bootstrapIntegration',
label: 'Bootstrap integration'
Expand Down
84 changes: 84 additions & 0 deletions demo/withPlugins/withLightColumnFilter.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<article class="main-content">
<header class="article-header">
<h1><i class="fa fa-play"></i>&nbsp;With the <a href="https://github.com/thansen-solire/datatables-light-columnfilter"> DataTables Light Column Filter</a></h1>
</header>
<section class="article-content">
<p>
The <code>angular-datatables</code> also provides an API in order to make the plugin <code>Light Column Filter</code> work with datatables.
</p>
<p>
You need to add the file <code>angular-datatables.light-columnfilter.min.js</code> to your HTML file.
</p>
<p class="alert alert-warning">
<i class="fa fa-warning"></i> The Light Column Filter only works with serverside processing! <br>
</p>
<p class="alert alert-warning">
<i class="fa fa-warning"></i> The Light Column Filter does not work with <code>Responsive</code>. Do not use with normal <code>Column Filter</code>
</p>
<p>
You also need to add the dependency <code>datatables.light-columnfilter</code> to your Angular app.
</p>
<p>
See the <a ui-sref="api">API</a> for the complete list of methods of the helper.
</p>
</section>
<section class="showcase">
<tabset>
<tab heading="Preview">
<article class="preview">
<div ng-controller="WithLightColumnFilterCtrl as showCase">
<table datatable dt-options="showCase.dtOptions" dt-columns="showCase.dtColumns" class="row-border hover">
<tfoot>
<tr>
<th>ID
<th>First Name
<th>Last Name
</tr>
</tfoot>
</table>
</div>
</article>
</tab>
<tab heading="HTML">
<div hljs>
<div ng-controller="WithLightColumnFilterCtrl as showCase">
<table datatable dt-options="showCase.dtOptions" dt-columns="showCase.dtColumns" class="row-border hover">
<tfoot>
<tr>
<th>ID
<th>First Name
<th>Last Name
</tr>
</tfoot>
</table>
</div>
<!-- ... -->
<script src="vendor/datatables-light-columnfilter/dist/dataTables.lightColumnFilter.min.js"></script>
<script src="vendor/angular-datatables/dist/plugins/light-columnfilter/angular-datatables.light-columnfilter.min.js"></script>
</div>
</tab>
<tab heading="JS">
<div hljs language="js">
angular.module('showcase.withLightColumnFilter', ['datatables', 'datatables.light-columnfilter'])
.controller('WithLightColumnFilterCtrl', WithLightColumnFilterCtrl);

function WithColumnFilterCtrl(DTOptionsBuilder, DTColumnBuilder) {
var vm = this;
vm.dtOptions = DTOptionsBuilder.fromSource('data.json')
.withPaginationType('full_numbers')
.withLightColumnFilter({
0 : { "type" : "text"},
1 : { "type" : "text"},
2 : { "type" : "text"}
});
vm.dtColumns = [
DTColumnBuilder.newColumn('id').withTitle('ID'),
DTColumnBuilder.newColumn('firstName').withTitle('First name'),
DTColumnBuilder.newColumn('lastName').withTitle('Last name')
];
}
</div>
</tab>
</tabset>
</section>
</article>
19 changes: 19 additions & 0 deletions demo/withPlugins/withLightColumnFilter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
'use strict';
angular.module('showcase.withLightColumnFilter', ['datatables', 'datatables.light-columnfilter'])
.controller('WithLightColumnFilterCtrl', WithLightColumnFilterCtrl);

function WithLightColumnFilterCtrl(DTOptionsBuilder, DTColumnBuilder) {
var vm = this;
vm.dtOptions = DTOptionsBuilder.fromSource('data.json')
.withPaginationType('full_numbers')
.withLightColumnFilter({
0 : { "type" : "text"},
1 : { "type" : "text"},
2 : { "type" : "text"}
});
vm.dtColumns = [
DTColumnBuilder.newColumn('id').withTitle('ID'),
DTColumnBuilder.newColumn('firstName').withTitle('First name'),
DTColumnBuilder.newColumn('lastName').withTitle('Last name')
];
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*!
* angular-datatables - v0.5.0
* https://github.com/l-lin/angular-datatables
* License: MIT
*/
(function (window, document, $, angular) {

'use strict';

// See https://github.com/thansen-solire/datatables-light-columnfilter
angular.module('datatables.light-columnfilter', ['datatables'])
.config(dtLightColumnFilterConfig)
.run(initLightColumnFilterPlugin);

/* @ngInject */
function dtLightColumnFilterConfig($provide) {
$provide.decorator('DTOptionsBuilder', dtOptionsBuilderDecorator);

function dtOptionsBuilderDecorator($delegate) {
var newOptions = $delegate.newOptions;
var fromSource = $delegate.fromSource;
var fromFnPromise = $delegate.fromFnPromise;

$delegate.newOptions = function() {
return _decorateOptions(newOptions);
};
$delegate.fromSource = function(ajax) {
return _decorateOptions(fromSource, ajax);
};
$delegate.fromFnPromise = function(fnPromise) {
return _decorateOptions(fromFnPromise, fnPromise);
};

return $delegate;

function _decorateOptions(fn, params) {
var options = fn(params);
options.withLightColumnFilter = withLightColumnFilter;
return options;

/**
* Add column filter support
* @param lightColumnFilterOptions the plugins options
* @returns {DTOptions} the options
*/
function withLightColumnFilter(lightColumnFilterOptions) {
options.hasLightColumnFilter = true;
if (lightColumnFilterOptions) {
options.lightColumnFilterOptions = lightColumnFilterOptions;
}
return options;
}
}
}
dtOptionsBuilderDecorator.$inject = ['$delegate'];
}
dtLightColumnFilterConfig.$inject = ['$provide'];

/* @ngInject */
function initLightColumnFilterPlugin(DTRendererService) {
var lightColumnFilterPlugin = {
postRender: postRender
};
DTRendererService.registerPlugin(lightColumnFilterPlugin);

function postRender(options, result) {
if (options && options.hasLightColumnFilter) {
new $.fn.dataTable.ColumnFilter(result.DataTable, options.lightColumnFilterOptions);
}
}
}
initLightColumnFilterPlugin.$inject = ['DTRendererService'];


})(window, document, jQuery, angular);

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions grunt/concat.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module.exports = {
'<%= yeoman.build %>/plugins/bootstrap/angular-datatables.bootstrap.js': ['<%= yeoman.src %>/plugins/bootstrap/*.js'],
'<%= yeoman.build %>/plugins/colreorder/angular-datatables.colreorder.js': ['<%= yeoman.src %>/plugins/colreorder/*.js'],
'<%= yeoman.build %>/plugins/columnfilter/angular-datatables.columnfilter.js': ['<%= yeoman.src %>/plugins/columnfilter/*.js'],
'<%= yeoman.build %>/plugins/light-columnfilter/angular-datatables.light-columnfilter.js': ['<%= yeoman.src %>/plugins/light-columnfilter/*.js'],
'<%= yeoman.build %>/plugins/colvis/angular-datatables.colvis.js': ['<%= yeoman.src %>/plugins/colvis/*.js'],
'<%= yeoman.build %>/plugins/scroller/angular-datatables.scroller.js': ['<%= yeoman.src %>/plugins/scroller/*.js'],
'<%= yeoman.build %>/plugins/tabletools/angular-datatables.tabletools.js': ['<%= yeoman.src %>/plugins/tabletools/*.js'],
Expand All @@ -27,6 +28,7 @@ module.exports = {
'<%= yeoman.dist %>/plugins/bootstrap/angular-datatables.bootstrap.js': ['<%= yeoman.build %>/plugins/bootstrap/angular-datatables.bootstrap.js'],
'<%= yeoman.dist %>/plugins/colreorder/angular-datatables.colreorder.js': ['<%= yeoman.build %>/plugins/colreorder/angular-datatables.colreorder.js'],
'<%= yeoman.dist %>/plugins/columnfilter/angular-datatables.columnfilter.js': ['<%= yeoman.build %>/plugins/columnfilter/angular-datatables.columnfilter.js'],
'<%= yeoman.dist %>/plugins/light-columnfilter/angular-datatables.light-columnfilter.js': ['<%= yeoman.build %>/plugins/light-columnfilter/angular-datatables.light-columnfilter.js'],
'<%= yeoman.dist %>/plugins/colvis/angular-datatables.colvis.js': ['<%= yeoman.build %>/plugins/colvis/angular-datatables.colvis.js'],
'<%= yeoman.dist %>/plugins/scroller/angular-datatables.scroller.js': ['<%= yeoman.build %>/plugins/scroller/angular-datatables.scroller.js'],
'<%= yeoman.dist %>/plugins/tabletools/angular-datatables.tabletools.js': ['<%= yeoman.build %>/plugins/tabletools/angular-datatables.tabletools.js'],
Expand Down
1 change: 1 addition & 0 deletions grunt/ngAnnotate.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = {
'<%= yeoman.build %>/plugins/bootstrap/angular-datatables.bootstrap.js': ['<%= yeoman.build %>/plugins/bootstrap/angular-datatables.bootstrap.js'],
'<%= yeoman.build %>/plugins/colreorder/angular-datatables.colreorder.js': ['<%= yeoman.build %>/plugins/colreorder/angular-datatables.colreorder.js'],
'<%= yeoman.build %>/plugins/columnfilter/angular-datatables.columnfilter.js': ['<%= yeoman.build %>/plugins/columnfilter/angular-datatables.columnfilter.js'],
'<%= yeoman.build %>/plugins/light-columnfilter/angular-datatables.light-columnfilter.js': ['<%= yeoman.build %>/plugins/light-columnfilter/angular-datatables.light-columnfilter.js'],
'<%= yeoman.build %>/plugins/colvis/angular-datatables.colvis.js': ['<%= yeoman.build %>/plugins/colvis/angular-datatables.colvis.js'],
'<%= yeoman.build %>/plugins/scroller/angular-datatables.scroller.js': ['<%= yeoman.build %>/plugins/scroller/angular-datatables.scroller.js'],
'<%= yeoman.build %>/plugins/tabletools/angular-datatables.tabletools.js': ['<%= yeoman.build %>/plugins/tabletools/angular-datatables.tabletools.js'],
Expand Down
3 changes: 3 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ <h1>
<script src="vendor/datatables-responsive/js/dataTables.responsive.js"></script>
<script src="vendor/datatables-scroller/js/dataTables.scroller.js"></script>
<script src="vendor/datatables-columnfilter/js/dataTables.columnFilter.js"></script>
<script src="vendor/datatables-light-columnfilter/dist/dataTables.lightColumnFilter.min.js"></script>
<script src="vendor/datatables-fixedcolumns/js/dataTables.fixedColumns.js"></script>
<script src="vendor/datatables-fixedheader/js/dataTables.fixedHeader.js"></script>
<script src="vendor/bootstrap/dist/js/bootstrap.min.js"></script>
Expand Down Expand Up @@ -101,6 +102,7 @@ <h1>
<script src="src/plugins/tabletools/angular-datatables.tabletools.js"></script>
<script src="src/plugins/scroller/angular-datatables.scroller.js"></script>
<script src="src/plugins/columnfilter/angular-datatables.columnfilter.js"></script>
<script src="src/plugins/light-columnfilter/angular-datatables.light-columnfilter.js"></script>
<script src="src/plugins/fixedcolumns/angular-datatables.fixedcolumns.js"></script>
<script src="src/plugins/fixedheader/angular-datatables.fixedheader.js"></script>

Expand Down Expand Up @@ -133,6 +135,7 @@ <h1>
<script src="demo/withPlugins/withResponsive.js"></script>
<script src="demo/withPlugins/withScroller.js"></script>
<script src="demo/withPlugins/withColumnFilter.js"></script>
<script src="demo/withPlugins/withLightColumnFilter.js"></script>
<script src="demo/withPlugins/withTableTools.js"></script>
<script src="demo/withPlugins/withAngularTranslate.js"></script>
<script src="demo/withPlugins/withAngularTranslateSwitchLanguage.js"></script>
Expand Down
1 change: 1 addition & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ require('./dist/plugins/bootstrap/angular-datatables.bootstrap');
require('./dist/plugins/bootstrap/datatables.bootstrap.css');
require('./dist/plugins/colreorder/angular-datatables.colreorder');
require('./dist/plugins/columnfilter/angular-datatables.columnfilter');
require('./dist/plugins/light-columnfilter/angular-datatables.light-columnfilter');
require('./dist/plugins/colvis/angular-datatables.colvis');
require('./dist/plugins/fixedcolumns/angular-datatables.fixedcolumns');
require('./dist/plugins/fixedheader/angular-datatables.fixedheader');
Expand Down
Loading

0 comments on commit cfaaef8

Please sign in to comment.