From 226af6498667134d8e3490d2510e2e0f2939f66e Mon Sep 17 00:00:00 2001 From: AlexanderZhukCoherent Date: Mon, 28 Dec 2015 13:20:25 +0300 Subject: [PATCH 01/10] Create CNAME playing with CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 0000000..b50d38a --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +demo/test.html From 76ca23f648551b68e642bd86f9cea57459d7f595 Mon Sep 17 00:00:00 2001 From: AlexanderZhukCoherent Date: Mon, 28 Dec 2015 13:22:21 +0300 Subject: [PATCH 02/10] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index b50d38a..5d119aa 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -demo/test.html +http://angular-data-grid.github.io/demo/test.html From 6860a2b6e01a51a9da48072ca969cf9b67bfbf5c Mon Sep 17 00:00:00 2001 From: AlexanderZhukCoherent Date: Mon, 28 Dec 2015 13:22:36 +0300 Subject: [PATCH 03/10] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 5d119aa..90a8efb 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -http://angular-data-grid.github.io/demo/test.html +angular-data-grid.github.io/demo/test.html From 6c2fd8766254ffc7e80ab5526371c39da12944bc Mon Sep 17 00:00:00 2001 From: "Zhuk, Alexander" Date: Fri, 1 Jan 2016 13:21:42 +0300 Subject: [PATCH 04/10] adding sample demo file to redirect --- demo/test.html | 19 +++++++++++++++++++ index.html | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 demo/test.html diff --git a/demo/test.html b/demo/test.html new file mode 100644 index 0000000..e71ae2c --- /dev/null +++ b/demo/test.html @@ -0,0 +1,19 @@ + + + + + Flat JSON format for data tables + + + +
+
+

TEST Go back

+
+
+ + + + + + \ No newline at end of file diff --git a/index.html b/index.html index d5668f9..98dbee0 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,8 @@
-

Angular Data Grid

+

Angular Data Grid Go to test page

+
From e47856712d6b59414130f2884ffabd4823da9f9a Mon Sep 17 00:00:00 2001 From: "Zhuk, Alexander" Date: Fri, 1 Jan 2016 13:23:41 +0300 Subject: [PATCH 05/10] renaming demo file --- demo/{test.html => index.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename demo/{test.html => index.html} (100%) diff --git a/demo/test.html b/demo/index.html similarity index 100% rename from demo/test.html rename to demo/index.html From 9a8c376797fb970ee0d3f4e495fefffcf2fb6739 Mon Sep 17 00:00:00 2001 From: AlexanderZhukCoherent Date: Mon, 28 Dec 2015 13:24:12 +0300 Subject: [PATCH 06/10] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 90a8efb..df802a3 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -angular-data-grid.github.io/demo/test.html +http://angular-data-grid.github.io/demo/ From eb700d43ebdf4828d0ca35da58ec8487ad7e54be Mon Sep 17 00:00:00 2001 From: AlexanderZhukCoherent Date: Mon, 28 Dec 2015 13:24:22 +0300 Subject: [PATCH 07/10] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index df802a3..a3afb06 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -http://angular-data-grid.github.io/demo/ +angular-data-grid.github.io/demo/ From b70914ee5d7a36faf25c4a49f120cef5046e4632 Mon Sep 17 00:00:00 2001 From: "Zhuk, Alexander" Date: Fri, 1 Jan 2016 13:30:20 +0300 Subject: [PATCH 08/10] removing CNAME and redirect to demo page --- CNAME | 1 - contributors.txt | 3 ++- index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index a3afb06..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -angular-data-grid.github.io/demo/ diff --git a/contributors.txt b/contributors.txt index aecbb51..d27c44e 100644 --- a/contributors.txt +++ b/contributors.txt @@ -1 +1,2 @@ -Eugene Draitsev \ No newline at end of file +Eugene Draitsev +Ivan Bisultanov \ No newline at end of file diff --git a/index.html b/index.html index 98dbee0..7c631f4 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@
-

Angular Data Grid Go to test page

+

Angular Data Grid

From e123593281bae8a33e054c26f4a6af0b30c6e359 Mon Sep 17 00:00:00 2001 From: "Zhuk, Alexander" Date: Fri, 1 Jan 2016 14:29:59 +0300 Subject: [PATCH 09/10] playing with Markdown styles --- README.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9ba6204..ecc8ba5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ -# angular-data-grid.github.io -Light and flexible Data Grid for AngularJS applications. +#Angular Data Grid + + +Light and flexible Data Grid for AngularJS applications. + +```javascript +var s = "JavaScript syntax highlighting"; +alert(s); +``` You can use Data Grid module to easily display data in grids with built-in sorting, outer filters and url-synchronization. To use it, you must add grid-data directive to element and pass 2 required parameters grid-options and grid-actions. @@ -9,14 +16,14 @@ grid-actions: Name of object in your controller with functions for updating grid Inside the grid-data directive you can use grid-pagination directive. It's just wrapper of angular-ui pagination directive. You can pass any parameters from pagination directive. Also you can use grid-item-per-page directive and pass into it array of value (f.e. "10, 25, 50"). If you need get size of current displayed items you can use filtered variable. -#Sorting: +##Sorting: You can use the sortable directive to have a built in sort feature. You add the attribute sortable to your table headers. This will specify the property name you want to sort by. Also if you add class sortable to your element, sort arrows will be displayed for acs/decs sort directions. -#Filters: +##Filters: Data Grid module has 4 types built in filters. To use it, you must add attribute filter-by to any element and pass property name, which you want filtering. Also you need add attribute filter-type with type of filter (text, select, dateFrom, dateTo). After that you need call filter() method in ng-change for text or select inputs and in ng-blur/ng-focus for datepickers. Filters synchronize with URL by ng-model value. -#Custom Filters: +##Custom Filters: If you need use some custom filters (f.e. filter by first letter), you must add filter-by to specify property name, which you want filtering and add ng-model property. Then create in gridOptions.customFilters variable named as it ng-model value and contain filtering function. Filtering function accept items, value, predicate arguments and must return filtered array. -#Others: +##Others: All filters has parameter disable-url. If you set it as true value - URL-synchronization for this filter will be disabled. If you need use 2 or more grids on page, you must add id to grids, and use grid-id attribute on filters to specify their grid. From 66295cf77972104654b24e64c86f1761bfef3660 Mon Sep 17 00:00:00 2001 From: "Zhuk, Alexander" Date: Fri, 1 Jan 2016 14:31:19 +0300 Subject: [PATCH 10/10] playing with Markdown styles2 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ecc8ba5..b47f7eb 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ Light and flexible Data Grid for AngularJS applications. -```javascript +``` var s = "JavaScript syntax highlighting"; alert(s); ``` -You can use Data Grid module to easily display data in grids with built-in sorting, outer filters and url-synchronization. To use it, you must add grid-data directive to element and pass 2 required parameters grid-options and grid-actions. +You can use ```data-trigger``` Data Grid module to easily display data in grids with built-in sorting, outer filters and url-synchronization. To use it, you must add grid-data directive to element and pass 2 required parameters grid-options and grid-actions. grid-options : Name of object in your controller with start options for grid. You must create this object with at least 1 required parameter - data