Merge pull request #138 from iamisti/feature-update-dependencies

Fix custom no message found message
iamisti · Jul 22, 2016 · 8cbb5c5 · 8cbb5c5
2 parents 253a683 + 03c7a3d
commit 8cbb5c5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/app/modules/main/directives/mdtTableDirective.js b/app/modules/main/directives/mdtTableDirective.js
@@ -146,6 +146,7 @@
                             mdtRowOptions: $scope.mdtRow,
                             mdtRowPaginatorFunction: $scope.mdtRowPaginator,
                             mdtRowPaginatorErrorMessage: $scope.mdtRowPaginatorErrorMessage,
+                            mdtRowPaginatorNoResultsMessage: $scope.mdtRowPaginatorNoResultsMessage,
                             mdtTriggerRequest: $scope.mdtTriggerRequest
                         });
                     }

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "mdDataTable",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "homepage": "https://github.com/iamisti/mdDataTable",
   "author":"Istvan Fodor <[email protected]>",
   "main": [

diff --git a/demo/developmentArea.html b/demo/developmentArea.html
@@ -13,6 +13,7 @@
             paginated-rows="{isEnabled: true, rowsPerPageValues: [5,10,20,50]}"
             mdt-row-paginator="paginatorCallback(page, pageSize)"
             mdt-row-paginator-error-message="Error happened during loading nutritions."
+            mdt-row-paginator-no-results-message="No results were found."
             mdt-trigger-request="getLoadResultsCallback(loadPageCallback)"
             mdt-row="{
             'table-row-id-key': 'fields.item_id',

diff --git a/dist/md-data-table.js b/dist/md-data-table.js
@@ -254,6 +254,7 @@
                             mdtRowOptions: $scope.mdtRow,
                             mdtRowPaginatorFunction: $scope.mdtRowPaginator,
                             mdtRowPaginatorErrorMessage: $scope.mdtRowPaginatorErrorMessage,
+                            mdtRowPaginatorNoResultsMessage: $scope.mdtRowPaginatorNoResultsMessage,
                             mdtTriggerRequest: $scope.mdtTriggerRequest
                         });
                     }
@@ -801,27 +802,6 @@
         .module('mdDataTable')
         .factory('TableDataStorageFactory', TableDataStorageFactory);
 }());
-(function(){
-    'use strict';
-
-    /**
-     * @name ColumnOptionProvider
-     * @returns possible assignable column options you can give
-     *
-     * @describe Representing the assignable properties to the columns you can give.
-     */
-    var ColumnOptionProvider = {
-        ALIGN_RULE : {
-            ALIGN_LEFT: 'left',
-            ALIGN_RIGHT: 'right'
-        }
-    };
-
-    angular
-        .module('mdDataTable')
-        .value('ColumnOptionProvider', ColumnOptionProvider);
-})();
-
 (function(){
     'use strict';
 
@@ -843,6 +823,27 @@
         .module('mdDataTable')
         .service('ColumnAlignmentHelper', ColumnAlignmentHelper);
 }());
+(function(){
+    'use strict';
+
+    /**
+     * @name ColumnOptionProvider
+     * @returns possible assignable column options you can give
+     *
+     * @describe Representing the assignable properties to the columns you can give.
+     */
+    var ColumnOptionProvider = {
+        ALIGN_RULE : {
+            ALIGN_LEFT: 'left',
+            ALIGN_RIGHT: 'right'
+        }
+    };
+
+    angular
+        .module('mdDataTable')
+        .value('ColumnOptionProvider', ColumnOptionProvider);
+})();
+
 (function(){
     'use strict';
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "md-data-table",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "author": "Istvan Fodor <[email protected]>",
   "registry": "github",
   "repository": {