From e4b50c0332c4a3ffcba65c2728d7159fee233bc7 Mon Sep 17 00:00:00 2001 From: leonar15 Date: Wed, 18 Dec 2013 15:17:51 -0800 Subject: [PATCH 1/2] Added ability to pass in "data" param when initializing table. Will also compute this.total from data Added default pagination method when this.data is set --- examples/demo27.html | 74 ++++++++++++++++++++++++++++++++++++++++ ng-table.js | 3 +- ng-table.map | 2 +- ng-table.src.js | 11 +++++- package.json | 5 +-- src/scripts/03-params.js | 11 +++++- 6 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 examples/demo27.html diff --git a/examples/demo27.html b/examples/demo27.html new file mode 100644 index 00000000..2e153085 --- /dev/null +++ b/examples/demo27.html @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + +

Table with data passed at init

+ +
+ +

Page: {{tableParams.page()}} +

Count per page: {{tableParams.count()}} + + + + + + + +
+ {{user.name}} + + {{user.age}} +
+ + + +

+ + + + \ No newline at end of file diff --git a/ng-table.js b/ng-table.js index 705f9849..2327d2f3 100644 --- a/ng-table.js +++ b/ng-table.js @@ -1,3 +1,4 @@ /*! ngTable v0.3.1 by Vitalii Savchuk(esvit666@gmail.com) - https://github.com/esvit/ng-table - New BSD License */ -!function(a,b){return"function"==typeof define&&define.amd?(define(["angular"],function(a){return b(a)}),void 0):b(a)}(angular||null,function(a){var b=a.module("ngTable",[]);b.factory("ngTableParams",["$q","$log",function(b,c){var d=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},e=function(e,f){var g=this;this.data=[],this.parameters=function(b,e){if(e=e||!1,a.isDefined(b)){for(var f in b){var g=b[f];if(e&&f.indexOf("[")>=0){for(var i=f.split(/\[(.*)\]/).reverse(),j="",k=0,l=i.length;l>k;k++){var m=i[k];if(""!==m){var n=g;g={},g[j=m]=d(n)?parseFloat(n):n}}"sorting"===j&&(h[j]={}),h[j]=a.extend(h[j]||{},g[j])}else h[f]=d(b[f])?parseFloat(b[f]):b[f]}return c.debug&&c.debug("ngTable: set parameters",h),this}return h},this.settings=function(b){return a.isDefined(b)?(j=a.extend(j,b),c.debug&&c.debug("ngTable: set settings",h),this):j},this.page=function(b){return a.isDefined(b)?this.parameters({page:b}):h.page},this.total=function(b){return a.isDefined(b)?this.settings({total:b}):j.total},this.count=function(b){return a.isDefined(b)?this.parameters({count:b,page:1}):h.count},this.filter=function(b){return a.isDefined(b)?this.parameters({filter:b}):h.filter},this.sorting=function(b){if(2==arguments.length){var c={};return c[b]=arguments[1],this.parameters({sorting:c}),this}return a.isDefined(b)?this.parameters({sorting:b}):h.sorting},this.isSortBy=function(b,c){return a.isDefined(h.sorting[b])&&h.sorting[b]==c},this.orderBy=function(){var a=[];for(var b in h.sorting)a.push(("asc"===h.sorting[b]?"+":"-")+b);return a},this.getData=function(a){a.resolve([])},this.getGroups=function(d,e){var f=b.defer();f.promise.then(function(b){var f={};for(var g in b){var h=b[g],i=a.isFunction(e)?e(h):h[e];f[i]=f[i]||{data:[]},f[i].value=i,f[i].data.push(h)}var j=[];for(var k in f)j.push(f[k]);c.debug&&c.debug("ngTable: refresh groups",j),d.resolve(j)}),this.getData(f,g)},this.generatePagesArray=function(a,b,c){var d,e,f,g,h,j;if(d=11,j=[],h=Math.ceil(b/c),h>1){for(j.push({type:"prev",number:Math.max(1,a-1),active:a>1}),j.push({type:"first",number:1,active:a>1}),f=Math.round((d-5)/2),g=Math.max(2,a-f),e=Math.min(h-1,a+2*f-(a-g)),g=Math.max(2,g-(2*f-(e-g))),i=g;e>=i;)i===g&&2!==i||i===e&&i!==h-1?j.push({type:"more",active:!1}):j.push({type:"page",number:i,active:a!==i}),i++;j.push({type:"last",number:h,active:a!==h}),j.push({type:"next",number:Math.min(h,a+1),active:h>a})}return j},this.url=function(b){b=b||!1;var c=b?[]:{};for(key in h)if(h.hasOwnProperty(key)){var d=h[key],e=encodeURIComponent(key);if("object"==typeof d){for(var f in d)if(!a.isUndefined(d[f])&&""!==d[f]){var g=e+"["+encodeURIComponent(f)+"]";b?c.push(g+"="+d[f]):c[g]=d[f]}}else a.isFunction(d)||a.isUndefined(d)||""===d||(b?c.push(e+"="+encodeURIComponent(d)):c[e]=encodeURIComponent(d))}return c},this.reload=function(){var a=b.defer(),d=this;j.$loading=!0,j.groupBy?j.getGroups(a,j.groupBy,this):j.getData(a,this),c.debug&&c.debug("ngTable: reload data"),a.promise.then(function(a){j.$loading=!1,c.debug&&c.debug("ngTable: current scope",j.$scope),d.data=j.groupBy?j.$scope.$groups=a:j.$scope.$data=a,j.$scope.pages=d.generatePagesArray(d.page(),d.total(),d.count())})},this.reloadPages=function(){var a=this;j.$scope.pages=a.generatePagesArray(a.page(),a.total(),a.count())};var h=this.$params={page:1,count:1,filter:{},sorting:{},group:{},groupBy:null},j={$scope:null,$loading:!1,total:0,counts:[10,25,50,100],getGroups:this.getGroups,getData:this.getData};return this.settings(f),this.parameters(e,!0),this};return e}]);var c=["$scope","ngTableParams","$q",function(a,b){a.$loading=!1,a.params||(a.params=new b),a.params.settings().$scope=a,a.$watch("params.$params",function(){a.params.settings().$scope=a,a.params.reload()},!0),a.sortBy=function(b){var c=a.parse(b.sortable);if(c){var d=a.params.sorting()&&a.params.sorting()[c]&&"desc"===a.params.sorting()[c],e={};e[c]=d?"asc":"desc",a.params.parameters({sorting:e})}}}];return b.directive("ngTable",["$compile","$q","$parse",function(b,d,e){"use strict";return{restrict:"A",priority:1001,scope:!0,controller:c,compile:function(c){var d=[],f=0,g=null,h=c.find("thead");return a.forEach(a.element(c.find("tr")),function(b){b=a.element(b),b.hasClass("ng-table-group")||g||(g=b)}),g?(a.forEach(g.find("td"),function(b){var c=a.element(b);if(!c.attr("ignore-cell")||"true"!==c.attr("ignore-cell")){var g=function(a,b){return function(f){return e(c.attr("x-data-"+a)||c.attr("data-"+a)||c.attr(a))(f,{$columns:d})||b}},h=g("title"," "),i=g("header",!1),j=g("filter",!1)(),k=!1;j&&j.templateURL&&(k=j.templateURL,delete j.templateURL),c.attr("data-title-text",h()),d.push({id:f++,title:h,sortable:g("sortable",!1),"class":c.attr("x-data-header-class")||c.attr("data-header-class")||c.attr("header-class"),filter:j,filterTemplateURL:k,headerTemplateURL:i,filterData:c.attr("filter-data")?c.attr("filter-data"):null,show:c.attr("ng-show")?function(a){return e(c.attr("ng-show"))(a)}:function(){return!0}})}}),function(c,f,g){if(c.$loading=!1,c.$columns=d,c.$watch(g.ngTable,function(b){a.isUndefined(b)||(c.paramsModel=e(g.ngTable),c.params=b)},!0),c.parse=function(b){return a.isDefined(b)?b(c):""},g.showFilter&&c.$parent.$watch(g.showFilter,function(a){c.show_filter=a}),a.forEach(d,function(b){var d;if(b.filterData){if(d=e(b.filterData)(c,{$column:b}),!a.isObject(d)||!a.isObject(d.promise))throw new Error("Function "+b.filterData+" must be instance of $q.defer()");return delete b.filterData,d.promise.then(function(c){a.isArray(c)||(c=[]),c.unshift({title:"-",id:""}),b.data=c})}}),!f.hasClass("ng-table")){c.templates={header:g.templateHeader?g.templateHeader:"ng-table/header.html",pagination:g.templatePagination?g.templatePagination:"ng-table/pager.html"};var i=h.length>0?h:a.element(document.createElement("thead")).attr("ng-include","templates.header"),j=a.element(document.createElement("div")).attr("ng-include","templates.pagination");return f.find("thead").remove(),f.find("tbody"),f.prepend(i),b(i)(c),b(j)(c),f.addClass("ng-table"),f.after(j)}}):void 0}}}]),a.module("ngTable").run(["$templateCache",function(a){a.put("ng-table/filters/select-multiple.html",''),a.put("ng-table/filters/select.html",''),a.put("ng-table/filters/text.html",''),a.put("ng-table/header.html",'
'),a.put("ng-table/pager.html",'
')}]),b}); + +!function(a,b){return"function"==typeof define&&define.amd?(define(["angular"],function(a){return b(a)}),void 0):b(a)}(angular||null,function(a){var b=a.module("ngTable",[]);b.factory("ngTableParams",["$q","$log",function(b,c){var d=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},e=function(e,f){var g=this;this.data=[],this.parameters=function(b,e){if(e=e||!1,a.isDefined(b)){for(var f in b){var g=b[f];if(e&&f.indexOf("[")>=0){for(var i=f.split(/\[(.*)\]/).reverse(),j="",k=0,l=i.length;l>k;k++){var m=i[k];if(""!==m){var n=g;g={},g[j=m]=d(n)?parseFloat(n):n}}"sorting"===j&&(h[j]={}),h[j]=a.extend(h[j]||{},g[j])}else h[f]=d(b[f])?parseFloat(b[f]):b[f]}return c.debug&&c.debug("ngTable: set parameters",h),this}return h},this.settings=function(b){return a.isDefined(b)?(a.isArray(b.data)&&(b.total=b.data.length),j=a.extend(j,b),c.debug&&c.debug("ngTable: set settings",h),this):j},this.page=function(b){return a.isDefined(b)?this.parameters({page:b}):h.page},this.total=function(b){return a.isDefined(b)?this.settings({total:b}):j.total},this.count=function(b){return a.isDefined(b)?this.parameters({count:b,page:1}):h.count},this.filter=function(b){return a.isDefined(b)?this.parameters({filter:b}):h.filter},this.sorting=function(b){if(2==arguments.length){var c={};return c[b]=arguments[1],this.parameters({sorting:c}),this}return a.isDefined(b)?this.parameters({sorting:b}):h.sorting},this.isSortBy=function(b,c){return a.isDefined(h.sorting[b])&&h.sorting[b]==c},this.orderBy=function(){var a=[];for(var b in h.sorting)a.push(("asc"===h.sorting[b]?"+":"-")+b);return a},this.getData=function(b,c){a.isArray(this.data)?b.resolve(this.data.slice((c.page()-1)*c.count(),c.page()*c.count())):b.resolve([])},this.getGroups=function(d,e){var f=b.defer();f.promise.then(function(b){var f={};for(var g in b){var h=b[g],i=a.isFunction(e)?e(h):h[e];f[i]=f[i]||{data:[]},f[i].value=i,f[i].data.push(h)}var j=[];for(var k in f)j.push(f[k]);c.debug&&c.debug("ngTable: refresh groups",j),d.resolve(j)}),this.getData(f,g)},this.generatePagesArray=function(a,b,c){var d,e,f,g,h,j;if(d=11,j=[],h=Math.ceil(b/c),h>1){for(j.push({type:"prev",number:Math.max(1,a-1),active:a>1}),j.push({type:"first",number:1,active:a>1}),f=Math.round((d-5)/2),g=Math.max(2,a-f),e=Math.min(h-1,a+2*f-(a-g)),g=Math.max(2,g-(2*f-(e-g))),i=g;e>=i;)i===g&&2!==i||i===e&&i!==h-1?j.push({type:"more",active:!1}):j.push({type:"page",number:i,active:a!==i}),i++;j.push({type:"last",number:h,active:a!==h}),j.push({type:"next",number:Math.min(h,a+1),active:h>a})}return j},this.url=function(b){b=b||!1;var c=b?[]:{};for(key in h)if(h.hasOwnProperty(key)){var d=h[key],e=encodeURIComponent(key);if("object"==typeof d){for(var f in d)if(!a.isUndefined(d[f])&&""!==d[f]){var g=e+"["+encodeURIComponent(f)+"]";b?c.push(g+"="+d[f]):c[g]=d[f]}}else a.isFunction(d)||a.isUndefined(d)||""===d||(b?c.push(e+"="+encodeURIComponent(d)):c[e]=encodeURIComponent(d))}return c},this.reload=function(){var a=b.defer(),d=this;j.$loading=!0,j.groupBy?j.getGroups(a,j.groupBy,this):j.getData(a,this),c.debug&&c.debug("ngTable: reload data"),a.promise.then(function(a){j.$loading=!1,c.debug&&c.debug("ngTable: current scope",j.$scope),d.data=j.groupBy?j.$scope.$groups=a:j.$scope.$data=a,j.$scope.pages=d.generatePagesArray(d.page(),d.total(),d.count())})},this.reloadPages=function(){var a=this;j.$scope.pages=a.generatePagesArray(a.page(),a.total(),a.count())};var h=this.$params={page:1,count:1,filter:{},sorting:{},group:{},groupBy:null},j={$scope:null,$loading:!1,data:null,total:0,counts:[10,25,50,100],getGroups:this.getGroups,getData:this.getData};return this.settings(f),this.parameters(e,!0),this};return e}]);var c=["$scope","ngTableParams","$q",function(a,b){a.$loading=!1,a.params||(a.params=new b),a.params.settings().$scope=a,a.$watch("params.$params",function(){a.params.settings().$scope=a,a.params.reload()},!0),a.sortBy=function(b){var c=a.parse(b.sortable);if(c){var d=a.params.sorting()&&a.params.sorting()[c]&&"desc"===a.params.sorting()[c],e={};e[c]=d?"asc":"desc",a.params.parameters({sorting:e})}}}];return b.directive("ngTable",["$compile","$q","$parse",function(b,d,e){"use strict";return{restrict:"A",priority:1001,scope:!0,controller:c,compile:function(c){var d=[],f=0,g=null,h=c.find("thead");return a.forEach(a.element(c.find("tr")),function(b){b=a.element(b),b.hasClass("ng-table-group")||g||(g=b)}),g?(a.forEach(g.find("td"),function(b){var c=a.element(b);if(!c.attr("ignore-cell")||"true"!==c.attr("ignore-cell")){var g=function(a,b){return function(f){return e(c.attr("x-data-"+a)||c.attr("data-"+a)||c.attr(a))(f,{$columns:d})||b}},h=g("title"," "),i=g("header",!1),j=g("filter",!1)(),k=!1;j&&j.templateURL&&(k=j.templateURL,delete j.templateURL),c.attr("data-title-text",h()),d.push({id:f++,title:h,sortable:g("sortable",!1),"class":c.attr("x-data-header-class")||c.attr("data-header-class")||c.attr("header-class"),filter:j,filterTemplateURL:k,headerTemplateURL:i,filterData:c.attr("filter-data")?c.attr("filter-data"):null,show:c.attr("ng-show")?function(a){return e(c.attr("ng-show"))(a)}:function(){return!0}})}}),function(c,f,g){if(c.$loading=!1,c.$columns=d,c.$watch(g.ngTable,function(b){a.isUndefined(b)||(c.paramsModel=e(g.ngTable),c.params=b)},!0),c.parse=function(b){return a.isDefined(b)?b(c):""},g.showFilter&&c.$parent.$watch(g.showFilter,function(a){c.show_filter=a}),a.forEach(d,function(b){var d;if(b.filterData){if(d=e(b.filterData)(c,{$column:b}),!a.isObject(d)||!a.isObject(d.promise))throw new Error("Function "+b.filterData+" must be instance of $q.defer()");return delete b.filterData,d.promise.then(function(c){a.isArray(c)||(c=[]),c.unshift({title:"-",id:""}),b.data=c})}}),!f.hasClass("ng-table")){c.templates={header:g.templateHeader?g.templateHeader:"ng-table/header.html",pagination:g.templatePagination?g.templatePagination:"ng-table/pager.html"};var i=h.length>0?h:a.element(document.createElement("thead")).attr("ng-include","templates.header"),j=a.element(document.createElement("div")).attr("ng-include","templates.pagination");f.find("thead").remove();{f.find("tbody")}return f.prepend(i),b(i)(c),b(j)(c),f.addClass("ng-table"),f.after(j)}}):void 0}}}]),a.module("ngTable").run(["$templateCache",function(a){a.put("ng-table/filters/select-multiple.html",''),a.put("ng-table/filters/select.html",''),a.put("ng-table/filters/text.html",''),a.put("ng-table/header.html",'
'),a.put("ng-table/pager.html",'
')}]),b}); //# sourceMappingURL=ng-table.map \ No newline at end of file diff --git a/ng-table.map b/ng-table.map index fd4a80f8..a1b684db 100644 --- a/ng-table.map +++ b/ng-table.map @@ -1 +1 @@ -{"version":3,"file":"ng-table.js","sources":["ng-table.src.js"],"names":["angular","factory","define","amd","app","module","$q","$log","isNumber","n","isNaN","parseFloat","isFinite","ngTableParams","baseParameters","baseSettings","self","this","data","parameters","newParameters","parseParamsFromUrl","isDefined","key","value","indexOf","keys","split","reverse","lastKey","i","len","length","name","v","params","extend","debug","settings","newSettings","page","total","count","filter","sorting","arguments","sortArray","isSortBy","field","direction","orderBy","column","push","getData","$defer","resolve","getGroups","defer","promise","then","groups","k","item","groupName","isFunction","result","generatePagesArray","currentPage","totalItems","pageSize","maxBlocks","maxPage","maxPivotPages","minPage","numPages","pages","Math","ceil","type","number","max","active","round","min","url","asString","pairs","hasOwnProperty","encodeURIComponent","subkey","isUndefined","pname","reload","$loading","groupBy","$scope","$groups","$data","reloadPages","$params","group","counts","ngTableController","$watch","sortBy","parsedSortable","parse","sortable","sortingParams","directive","$compile","$parse","restrict","priority","scope","controller","compile","element","columns","row","thead","find","forEach","tr","hasClass","el","attr","parsedAttribute","defaultValue","$columns","parsedTitle","headerTemplateURL","filterTemplateURL","templateURL","id","title","class","filterData","show","attrs","ngTable","paramsModel","text","showFilter","$parent","show_filter","def","$column","isObject","Error","isArray","unshift","templates","header","templateHeader","pagination","templatePagination","headerTemplate","document","createElement","paginationTemplate","remove","prepend","addClass","after","run","$templateCache","put"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ng-table.js","sources":["ng-table.src.js"],"names":["angular","factory","define","amd","app","module","$q","$log","isNumber","n","isNaN","parseFloat","isFinite","ngTableParams","baseParameters","baseSettings","self","this","data","parameters","newParameters","parseParamsFromUrl","isDefined","key","value","indexOf","keys","split","reverse","lastKey","i","len","length","name","v","params","extend","debug","settings","newSettings","isArray","total","page","count","filter","sorting","arguments","sortArray","isSortBy","field","direction","orderBy","column","push","getData","$defer","resolve","slice","getGroups","defer","promise","then","groups","k","item","groupName","isFunction","result","generatePagesArray","currentPage","totalItems","pageSize","maxBlocks","maxPage","maxPivotPages","minPage","numPages","pages","Math","ceil","type","number","max","active","round","min","url","asString","pairs","hasOwnProperty","encodeURIComponent","subkey","isUndefined","pname","reload","$loading","groupBy","$scope","$groups","$data","reloadPages","$params","group","counts","ngTableController","$watch","sortBy","parsedSortable","parse","sortable","sortingParams","directive","$compile","$parse","restrict","priority","scope","controller","compile","element","columns","row","thead","find","forEach","tr","hasClass","el","attr","parsedAttribute","defaultValue","$columns","parsedTitle","headerTemplateURL","filterTemplateURL","templateURL","id","title","class","filterData","show","attrs","ngTable","paramsModel","text","showFilter","$parent","show_filter","def","$column","isObject","Error","unshift","templates","header","templateHeader","pagination","templatePagination","headerTemplate","document","createElement","paginationTemplate","remove","prepend","addClass","after","run","$templateCache","put"],"mappings":"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"} \ No newline at end of file diff --git a/ng-table.src.js b/ng-table.src.js index 76e879e3..8a79f706 100644 --- a/ng-table.src.js +++ b/ng-table.src.js @@ -117,6 +117,10 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { */ this.settings = function (newSettings) { if (angular.isDefined(newSettings)) { + if (angular.isArray(newSettings.data)) { + //auto-set the total from passed in data + newSettings.total = newSettings.data.length; + } settings = angular.extend(settings, newSettings); $log.debug && $log.debug('ngTable: set settings', params); return this; @@ -236,7 +240,11 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { * @param {Object} params New parameters */ this.getData = function ($defer, params) { - $defer.resolve([]); + if (angular.isArray(this.data)) { + $defer.resolve(this.data.slice((params.page() - 1) * params.count(), params.page() * params.count())); + } else { + $defer.resolve([]); + } }; /** @@ -415,6 +423,7 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { var settings = { $scope: null, // set by ngTable controller $loading: false, + data: null, //allows data to be set when table is initialized total: 0, counts: [10, 25, 50, 100], getGroups: this.getGroups, diff --git a/package.json b/package.json index 0babd96e..c882bff4 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "grunt-contrib-concat": "~0.3.0", "grunt-contrib-requirejs": "~0.4.0", "grunt-contrib-uglify": "~0.2.1", - "grunt": "~0.4.1", + "grunt": "~0.4.2", "grunt-contrib-less": "~0.5.2", "grunt-contrib-cssmin": "~0.6.1", "karma": "~0.10", @@ -27,7 +27,8 @@ "karma-firefox-launcher": "*", "karma-ng-html2js-preprocessor": "*", "coveralls": "", - "karma-coverage": "~0.1.0" + "karma-coverage": "~0.1.0", + "grunt-coffee-build": "~1.4.12" }, "scripts": { "test": "karma start --single-run --no-auto-watch" diff --git a/src/scripts/03-params.js b/src/scripts/03-params.js index ea94f583..882bcc0a 100644 --- a/src/scripts/03-params.js +++ b/src/scripts/03-params.js @@ -71,6 +71,10 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { */ this.settings = function (newSettings) { if (angular.isDefined(newSettings)) { + if (angular.isArray(newSettings.data)) { + //auto-set the total from passed in data + newSettings.total = newSettings.data.length; + } settings = angular.extend(settings, newSettings); $log.debug && $log.debug('ngTable: set settings', params); return this; @@ -190,7 +194,11 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { * @param {Object} params New parameters */ this.getData = function ($defer, params) { - $defer.resolve([]); + if (angular.isArray(this.data)) { + $defer.resolve(this.data.slice((params.page() - 1) * params.count(), params.page() * params.count())); + } else { + $defer.resolve([]); + } }; /** @@ -369,6 +377,7 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { var settings = { $scope: null, // set by ngTable controller $loading: false, + data: null, //allows data to be set when table is initialized total: 0, counts: [10, 25, 50, 100], getGroups: this.getGroups, From bd797ea8246cad8ba806fe83d39806b06b7bb46e Mon Sep 17 00:00:00 2001 From: leonar15 Date: Thu, 19 Dec 2013 18:04:53 -0800 Subject: [PATCH 2/2] -fixed an issue in the tests to support new data setting -added an extra check when dealing with params in default getData method --- ng-table.js | 2 +- ng-table.map | 2 +- ng-table.src.js | 4 ++-- src/scripts/03-params.js | 4 ++-- test/tableParamsSpec.js | 2 ++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ng-table.js b/ng-table.js index 2327d2f3..897cf5ea 100644 --- a/ng-table.js +++ b/ng-table.js @@ -1,4 +1,4 @@ /*! ngTable v0.3.1 by Vitalii Savchuk(esvit666@gmail.com) - https://github.com/esvit/ng-table - New BSD License */ -!function(a,b){return"function"==typeof define&&define.amd?(define(["angular"],function(a){return b(a)}),void 0):b(a)}(angular||null,function(a){var b=a.module("ngTable",[]);b.factory("ngTableParams",["$q","$log",function(b,c){var d=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},e=function(e,f){var g=this;this.data=[],this.parameters=function(b,e){if(e=e||!1,a.isDefined(b)){for(var f in b){var g=b[f];if(e&&f.indexOf("[")>=0){for(var i=f.split(/\[(.*)\]/).reverse(),j="",k=0,l=i.length;l>k;k++){var m=i[k];if(""!==m){var n=g;g={},g[j=m]=d(n)?parseFloat(n):n}}"sorting"===j&&(h[j]={}),h[j]=a.extend(h[j]||{},g[j])}else h[f]=d(b[f])?parseFloat(b[f]):b[f]}return c.debug&&c.debug("ngTable: set parameters",h),this}return h},this.settings=function(b){return a.isDefined(b)?(a.isArray(b.data)&&(b.total=b.data.length),j=a.extend(j,b),c.debug&&c.debug("ngTable: set settings",h),this):j},this.page=function(b){return a.isDefined(b)?this.parameters({page:b}):h.page},this.total=function(b){return a.isDefined(b)?this.settings({total:b}):j.total},this.count=function(b){return a.isDefined(b)?this.parameters({count:b,page:1}):h.count},this.filter=function(b){return a.isDefined(b)?this.parameters({filter:b}):h.filter},this.sorting=function(b){if(2==arguments.length){var c={};return c[b]=arguments[1],this.parameters({sorting:c}),this}return a.isDefined(b)?this.parameters({sorting:b}):h.sorting},this.isSortBy=function(b,c){return a.isDefined(h.sorting[b])&&h.sorting[b]==c},this.orderBy=function(){var a=[];for(var b in h.sorting)a.push(("asc"===h.sorting[b]?"+":"-")+b);return a},this.getData=function(b,c){a.isArray(this.data)?b.resolve(this.data.slice((c.page()-1)*c.count(),c.page()*c.count())):b.resolve([])},this.getGroups=function(d,e){var f=b.defer();f.promise.then(function(b){var f={};for(var g in b){var h=b[g],i=a.isFunction(e)?e(h):h[e];f[i]=f[i]||{data:[]},f[i].value=i,f[i].data.push(h)}var j=[];for(var k in f)j.push(f[k]);c.debug&&c.debug("ngTable: refresh groups",j),d.resolve(j)}),this.getData(f,g)},this.generatePagesArray=function(a,b,c){var d,e,f,g,h,j;if(d=11,j=[],h=Math.ceil(b/c),h>1){for(j.push({type:"prev",number:Math.max(1,a-1),active:a>1}),j.push({type:"first",number:1,active:a>1}),f=Math.round((d-5)/2),g=Math.max(2,a-f),e=Math.min(h-1,a+2*f-(a-g)),g=Math.max(2,g-(2*f-(e-g))),i=g;e>=i;)i===g&&2!==i||i===e&&i!==h-1?j.push({type:"more",active:!1}):j.push({type:"page",number:i,active:a!==i}),i++;j.push({type:"last",number:h,active:a!==h}),j.push({type:"next",number:Math.min(h,a+1),active:h>a})}return j},this.url=function(b){b=b||!1;var c=b?[]:{};for(key in h)if(h.hasOwnProperty(key)){var d=h[key],e=encodeURIComponent(key);if("object"==typeof d){for(var f in d)if(!a.isUndefined(d[f])&&""!==d[f]){var g=e+"["+encodeURIComponent(f)+"]";b?c.push(g+"="+d[f]):c[g]=d[f]}}else a.isFunction(d)||a.isUndefined(d)||""===d||(b?c.push(e+"="+encodeURIComponent(d)):c[e]=encodeURIComponent(d))}return c},this.reload=function(){var a=b.defer(),d=this;j.$loading=!0,j.groupBy?j.getGroups(a,j.groupBy,this):j.getData(a,this),c.debug&&c.debug("ngTable: reload data"),a.promise.then(function(a){j.$loading=!1,c.debug&&c.debug("ngTable: current scope",j.$scope),d.data=j.groupBy?j.$scope.$groups=a:j.$scope.$data=a,j.$scope.pages=d.generatePagesArray(d.page(),d.total(),d.count())})},this.reloadPages=function(){var a=this;j.$scope.pages=a.generatePagesArray(a.page(),a.total(),a.count())};var h=this.$params={page:1,count:1,filter:{},sorting:{},group:{},groupBy:null},j={$scope:null,$loading:!1,data:null,total:0,counts:[10,25,50,100],getGroups:this.getGroups,getData:this.getData};return this.settings(f),this.parameters(e,!0),this};return e}]);var c=["$scope","ngTableParams","$q",function(a,b){a.$loading=!1,a.params||(a.params=new b),a.params.settings().$scope=a,a.$watch("params.$params",function(){a.params.settings().$scope=a,a.params.reload()},!0),a.sortBy=function(b){var c=a.parse(b.sortable);if(c){var d=a.params.sorting()&&a.params.sorting()[c]&&"desc"===a.params.sorting()[c],e={};e[c]=d?"asc":"desc",a.params.parameters({sorting:e})}}}];return b.directive("ngTable",["$compile","$q","$parse",function(b,d,e){"use strict";return{restrict:"A",priority:1001,scope:!0,controller:c,compile:function(c){var d=[],f=0,g=null,h=c.find("thead");return a.forEach(a.element(c.find("tr")),function(b){b=a.element(b),b.hasClass("ng-table-group")||g||(g=b)}),g?(a.forEach(g.find("td"),function(b){var c=a.element(b);if(!c.attr("ignore-cell")||"true"!==c.attr("ignore-cell")){var g=function(a,b){return function(f){return e(c.attr("x-data-"+a)||c.attr("data-"+a)||c.attr(a))(f,{$columns:d})||b}},h=g("title"," "),i=g("header",!1),j=g("filter",!1)(),k=!1;j&&j.templateURL&&(k=j.templateURL,delete j.templateURL),c.attr("data-title-text",h()),d.push({id:f++,title:h,sortable:g("sortable",!1),"class":c.attr("x-data-header-class")||c.attr("data-header-class")||c.attr("header-class"),filter:j,filterTemplateURL:k,headerTemplateURL:i,filterData:c.attr("filter-data")?c.attr("filter-data"):null,show:c.attr("ng-show")?function(a){return e(c.attr("ng-show"))(a)}:function(){return!0}})}}),function(c,f,g){if(c.$loading=!1,c.$columns=d,c.$watch(g.ngTable,function(b){a.isUndefined(b)||(c.paramsModel=e(g.ngTable),c.params=b)},!0),c.parse=function(b){return a.isDefined(b)?b(c):""},g.showFilter&&c.$parent.$watch(g.showFilter,function(a){c.show_filter=a}),a.forEach(d,function(b){var d;if(b.filterData){if(d=e(b.filterData)(c,{$column:b}),!a.isObject(d)||!a.isObject(d.promise))throw new Error("Function "+b.filterData+" must be instance of $q.defer()");return delete b.filterData,d.promise.then(function(c){a.isArray(c)||(c=[]),c.unshift({title:"-",id:""}),b.data=c})}}),!f.hasClass("ng-table")){c.templates={header:g.templateHeader?g.templateHeader:"ng-table/header.html",pagination:g.templatePagination?g.templatePagination:"ng-table/pager.html"};var i=h.length>0?h:a.element(document.createElement("thead")).attr("ng-include","templates.header"),j=a.element(document.createElement("div")).attr("ng-include","templates.pagination");f.find("thead").remove();{f.find("tbody")}return f.prepend(i),b(i)(c),b(j)(c),f.addClass("ng-table"),f.after(j)}}):void 0}}}]),a.module("ngTable").run(["$templateCache",function(a){a.put("ng-table/filters/select-multiple.html",''),a.put("ng-table/filters/select.html",''),a.put("ng-table/filters/text.html",''),a.put("ng-table/header.html",'
'),a.put("ng-table/pager.html",'
')}]),b}); +!function(a,b){return"function"==typeof define&&define.amd?(define(["angular"],function(a){return b(a)}),void 0):b(a)}(angular||null,function(a){var b=a.module("ngTable",[]);b.factory("ngTableParams",["$q","$log",function(b,c){var d=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},e=function(e,f){var g=this;this.data=[],this.parameters=function(b,e){if(e=e||!1,a.isDefined(b)){for(var f in b){var g=b[f];if(e&&f.indexOf("[")>=0){for(var i=f.split(/\[(.*)\]/).reverse(),j="",k=0,l=i.length;l>k;k++){var m=i[k];if(""!==m){var n=g;g={},g[j=m]=d(n)?parseFloat(n):n}}"sorting"===j&&(h[j]={}),h[j]=a.extend(h[j]||{},g[j])}else h[f]=d(b[f])?parseFloat(b[f]):b[f]}return c.debug&&c.debug("ngTable: set parameters",h),this}return h},this.settings=function(b){return a.isDefined(b)?(a.isArray(b.data)&&(b.total=b.data.length),j=a.extend(j,b),c.debug&&c.debug("ngTable: set settings",j),this):j},this.page=function(b){return a.isDefined(b)?this.parameters({page:b}):h.page},this.total=function(b){return a.isDefined(b)?this.settings({total:b}):j.total},this.count=function(b){return a.isDefined(b)?this.parameters({count:b,page:1}):h.count},this.filter=function(b){return a.isDefined(b)?this.parameters({filter:b}):h.filter},this.sorting=function(b){if(2==arguments.length){var c={};return c[b]=arguments[1],this.parameters({sorting:c}),this}return a.isDefined(b)?this.parameters({sorting:b}):h.sorting},this.isSortBy=function(b,c){return a.isDefined(h.sorting[b])&&h.sorting[b]==c},this.orderBy=function(){var a=[];for(var b in h.sorting)a.push(("asc"===h.sorting[b]?"+":"-")+b);return a},this.getData=function(b,c){a.isArray(this.data)&&a.isObject(c)?b.resolve(this.data.slice((c.page()-1)*c.count(),c.page()*c.count())):b.resolve([])},this.getGroups=function(d,e){var f=b.defer();f.promise.then(function(b){var f={};for(var g in b){var h=b[g],i=a.isFunction(e)?e(h):h[e];f[i]=f[i]||{data:[]},f[i].value=i,f[i].data.push(h)}var j=[];for(var k in f)j.push(f[k]);c.debug&&c.debug("ngTable: refresh groups",j),d.resolve(j)}),this.getData(f,g)},this.generatePagesArray=function(a,b,c){var d,e,f,g,h,j;if(d=11,j=[],h=Math.ceil(b/c),h>1){for(j.push({type:"prev",number:Math.max(1,a-1),active:a>1}),j.push({type:"first",number:1,active:a>1}),f=Math.round((d-5)/2),g=Math.max(2,a-f),e=Math.min(h-1,a+2*f-(a-g)),g=Math.max(2,g-(2*f-(e-g))),i=g;e>=i;)i===g&&2!==i||i===e&&i!==h-1?j.push({type:"more",active:!1}):j.push({type:"page",number:i,active:a!==i}),i++;j.push({type:"last",number:h,active:a!==h}),j.push({type:"next",number:Math.min(h,a+1),active:h>a})}return j},this.url=function(b){b=b||!1;var c=b?[]:{};for(key in h)if(h.hasOwnProperty(key)){var d=h[key],e=encodeURIComponent(key);if("object"==typeof d){for(var f in d)if(!a.isUndefined(d[f])&&""!==d[f]){var g=e+"["+encodeURIComponent(f)+"]";b?c.push(g+"="+d[f]):c[g]=d[f]}}else a.isFunction(d)||a.isUndefined(d)||""===d||(b?c.push(e+"="+encodeURIComponent(d)):c[e]=encodeURIComponent(d))}return c},this.reload=function(){var a=b.defer(),d=this;j.$loading=!0,j.groupBy?j.getGroups(a,j.groupBy,this):j.getData(a,this),c.debug&&c.debug("ngTable: reload data"),a.promise.then(function(a){j.$loading=!1,c.debug&&c.debug("ngTable: current scope",j.$scope),d.data=j.groupBy?j.$scope.$groups=a:j.$scope.$data=a,j.$scope.pages=d.generatePagesArray(d.page(),d.total(),d.count())})},this.reloadPages=function(){var a=this;j.$scope.pages=a.generatePagesArray(a.page(),a.total(),a.count())};var h=this.$params={page:1,count:1,filter:{},sorting:{},group:{},groupBy:null},j={$scope:null,$loading:!1,data:null,total:0,counts:[10,25,50,100],getGroups:this.getGroups,getData:this.getData};return this.settings(f),this.parameters(e,!0),this};return e}]);var c=["$scope","ngTableParams","$q",function(a,b){a.$loading=!1,a.params||(a.params=new b),a.params.settings().$scope=a,a.$watch("params.$params",function(){a.params.settings().$scope=a,a.params.reload()},!0),a.sortBy=function(b){var c=a.parse(b.sortable);if(c){var d=a.params.sorting()&&a.params.sorting()[c]&&"desc"===a.params.sorting()[c],e={};e[c]=d?"asc":"desc",a.params.parameters({sorting:e})}}}];return b.directive("ngTable",["$compile","$q","$parse",function(b,d,e){"use strict";return{restrict:"A",priority:1001,scope:!0,controller:c,compile:function(c){var d=[],f=0,g=null,h=c.find("thead");return a.forEach(a.element(c.find("tr")),function(b){b=a.element(b),b.hasClass("ng-table-group")||g||(g=b)}),g?(a.forEach(g.find("td"),function(b){var c=a.element(b);if(!c.attr("ignore-cell")||"true"!==c.attr("ignore-cell")){var g=function(a,b){return function(f){return e(c.attr("x-data-"+a)||c.attr("data-"+a)||c.attr(a))(f,{$columns:d})||b}},h=g("title"," "),i=g("header",!1),j=g("filter",!1)(),k=!1;j&&j.templateURL&&(k=j.templateURL,delete j.templateURL),c.attr("data-title-text",h()),d.push({id:f++,title:h,sortable:g("sortable",!1),"class":c.attr("x-data-header-class")||c.attr("data-header-class")||c.attr("header-class"),filter:j,filterTemplateURL:k,headerTemplateURL:i,filterData:c.attr("filter-data")?c.attr("filter-data"):null,show:c.attr("ng-show")?function(a){return e(c.attr("ng-show"))(a)}:function(){return!0}})}}),function(c,f,g){if(c.$loading=!1,c.$columns=d,c.$watch(g.ngTable,function(b){a.isUndefined(b)||(c.paramsModel=e(g.ngTable),c.params=b)},!0),c.parse=function(b){return a.isDefined(b)?b(c):""},g.showFilter&&c.$parent.$watch(g.showFilter,function(a){c.show_filter=a}),a.forEach(d,function(b){var d;if(b.filterData){if(d=e(b.filterData)(c,{$column:b}),!a.isObject(d)||!a.isObject(d.promise))throw new Error("Function "+b.filterData+" must be instance of $q.defer()");return delete b.filterData,d.promise.then(function(c){a.isArray(c)||(c=[]),c.unshift({title:"-",id:""}),b.data=c})}}),!f.hasClass("ng-table")){c.templates={header:g.templateHeader?g.templateHeader:"ng-table/header.html",pagination:g.templatePagination?g.templatePagination:"ng-table/pager.html"};var i=h.length>0?h:a.element(document.createElement("thead")).attr("ng-include","templates.header"),j=a.element(document.createElement("div")).attr("ng-include","templates.pagination");f.find("thead").remove();{f.find("tbody")}return f.prepend(i),b(i)(c),b(j)(c),f.addClass("ng-table"),f.after(j)}}):void 0}}}]),a.module("ngTable").run(["$templateCache",function(a){a.put("ng-table/filters/select-multiple.html",''),a.put("ng-table/filters/select.html",''),a.put("ng-table/filters/text.html",''),a.put("ng-table/header.html",'
'),a.put("ng-table/pager.html",'
')}]),b}); //# sourceMappingURL=ng-table.map \ No newline at end of file diff --git a/ng-table.map b/ng-table.map index a1b684db..ac14ad9a 100644 --- a/ng-table.map +++ b/ng-table.map @@ -1 +1 @@ -{"version":3,"file":"ng-table.js","sources":["ng-table.src.js"],"names":["angular","factory","define","amd","app","module","$q","$log","isNumber","n","isNaN","parseFloat","isFinite","ngTableParams","baseParameters","baseSettings","self","this","data","parameters","newParameters","parseParamsFromUrl","isDefined","key","value","indexOf","keys","split","reverse","lastKey","i","len","length","name","v","params","extend","debug","settings","newSettings","isArray","total","page","count","filter","sorting","arguments","sortArray","isSortBy","field","direction","orderBy","column","push","getData","$defer","resolve","slice","getGroups","defer","promise","then","groups","k","item","groupName","isFunction","result","generatePagesArray","currentPage","totalItems","pageSize","maxBlocks","maxPage","maxPivotPages","minPage","numPages","pages","Math","ceil","type","number","max","active","round","min","url","asString","pairs","hasOwnProperty","encodeURIComponent","subkey","isUndefined","pname","reload","$loading","groupBy","$scope","$groups","$data","reloadPages","$params","group","counts","ngTableController","$watch","sortBy","parsedSortable","parse","sortable","sortingParams","directive","$compile","$parse","restrict","priority","scope","controller","compile","element","columns","row","thead","find","forEach","tr","hasClass","el","attr","parsedAttribute","defaultValue","$columns","parsedTitle","headerTemplateURL","filterTemplateURL","templateURL","id","title","class","filterData","show","attrs","ngTable","paramsModel","text","showFilter","$parent","show_filter","def","$column","isObject","Error","unshift","templates","header","templateHeader","pagination","templatePagination","headerTemplate","document","createElement","paginationTemplate","remove","prepend","addClass","after","run","$templateCache","put"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ng-table.js","sources":["ng-table.src.js"],"names":["angular","factory","define","amd","app","module","$q","$log","isNumber","n","isNaN","parseFloat","isFinite","ngTableParams","baseParameters","baseSettings","self","this","data","parameters","newParameters","parseParamsFromUrl","isDefined","key","value","indexOf","keys","split","reverse","lastKey","i","len","length","name","v","params","extend","debug","settings","newSettings","isArray","total","page","count","filter","sorting","arguments","sortArray","isSortBy","field","direction","orderBy","column","push","getData","$defer","isObject","resolve","slice","getGroups","defer","promise","then","groups","k","item","groupName","isFunction","result","generatePagesArray","currentPage","totalItems","pageSize","maxBlocks","maxPage","maxPivotPages","minPage","numPages","pages","Math","ceil","type","number","max","active","round","min","url","asString","pairs","hasOwnProperty","encodeURIComponent","subkey","isUndefined","pname","reload","$loading","groupBy","$scope","$groups","$data","reloadPages","$params","group","counts","ngTableController","$watch","sortBy","parsedSortable","parse","sortable","sortingParams","directive","$compile","$parse","restrict","priority","scope","controller","compile","element","columns","row","thead","find","forEach","tr","hasClass","el","attr","parsedAttribute","defaultValue","$columns","parsedTitle","headerTemplateURL","filterTemplateURL","templateURL","id","title","class","filterData","show","attrs","ngTable","paramsModel","text","showFilter","$parent","show_filter","def","$column","Error","unshift","templates","header","templateHeader","pagination","templatePagination","headerTemplate","document","createElement","paginationTemplate","remove","prepend","addClass","after","run","$templateCache","put"],"mappings":"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"} \ No newline at end of file diff --git a/ng-table.src.js b/ng-table.src.js index 8a79f706..a73062b5 100644 --- a/ng-table.src.js +++ b/ng-table.src.js @@ -122,7 +122,7 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { newSettings.total = newSettings.data.length; } settings = angular.extend(settings, newSettings); - $log.debug && $log.debug('ngTable: set settings', params); + $log.debug && $log.debug('ngTable: set settings', settings); return this; } return settings; @@ -240,7 +240,7 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { * @param {Object} params New parameters */ this.getData = function ($defer, params) { - if (angular.isArray(this.data)) { + if (angular.isArray(this.data) && angular.isObject(params)) { $defer.resolve(this.data.slice((params.page() - 1) * params.count(), params.page() * params.count())); } else { $defer.resolve([]); diff --git a/src/scripts/03-params.js b/src/scripts/03-params.js index 882bcc0a..f82e8677 100644 --- a/src/scripts/03-params.js +++ b/src/scripts/03-params.js @@ -76,7 +76,7 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { newSettings.total = newSettings.data.length; } settings = angular.extend(settings, newSettings); - $log.debug && $log.debug('ngTable: set settings', params); + $log.debug && $log.debug('ngTable: set settings', settings); return this; } return settings; @@ -194,7 +194,7 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) { * @param {Object} params New parameters */ this.getData = function ($defer, params) { - if (angular.isArray(this.data)) { + if (angular.isArray(this.data) && angular.isObject(params)) { $defer.resolve(this.data.slice((params.page() - 1) * params.count(), params.page() * params.count())); } else { $defer.resolve([]); diff --git a/test/tableParamsSpec.js b/test/tableParamsSpec.js index d94d7a10..fb81f6af 100644 --- a/test/tableParamsSpec.js +++ b/test/tableParamsSpec.js @@ -144,6 +144,7 @@ describe('ngTableParams', function () { expect(params.settings()).toEqual({ $scope: null, $loading: false, + data: null, total: 0, counts: [10, 25, 50, 100], getData: params.getData, @@ -159,6 +160,7 @@ describe('ngTableParams', function () { expect(params.settings()).toEqual({ $scope: null, $loading: false, + data: null, total: 100, counts: [10, 25, 50, 100], getData: params.getData,