Sync with Kendo UI Professional

Author: Kendo Bot

src/kendo.data.js

@@ -4562,6 +4562,7 @@ var __meta__ = { // jshint ignore:line
                 filters: []
             };
 
+            filter.logic = 'and';
             filter = extend(true, {}, filter);
             filter.filters.push({
                 field: group.field,

src/kendo.pager.js

@@ -270,7 +270,7 @@ var __meta__ = { // jshint ignore:line
         options: {
             name: "Pager",
             ARIATemplate: "Page navigation, page #=page# of #=totalPages#",
-            selectTemplate: '<li><span tabindex="#=tabindex#" #if (navigatable) {# aria-label="#=title#" #}# class="k-link k-state-selected">#=text#</span></li>',
+            selectTemplate: '<li><span role="button" tabindex="#=tabindex#" #if (navigatable) {# aria-label="#=title#" #}# class="k-link k-state-selected">#=text#</span></li>',
             currentPageTemplate: '<li class="k-current-page"><span class="k-link k-pager-nav">#=text#</span></li>',
             linkTemplate: '<li><a tabindex="#=tabindex#" href="\\#" class="k-link" data-#=ns#page="#=idx#" #if (title !== "") {# title="#=title#" #}#>#=text#</a></li>',
             numericItemTemplate: '<li><a tabindex="-1" href="\\#" class="k-link" data-#=ns#page="#=idx#" #if (title !== "") {# title="#=title#" #}#>#=text#</a></li>',

tests/data/datasource/group-paging.js

@@ -1394,6 +1394,23 @@
             assert.isTrue(typeof result.filters !== 'undefined');
         });
 
+        it("_composeItemsFilter should return a filter with 'and' logic", function () {
+            var dataSource = remoteDataSource(null, {
+                total: 100,
+                serverPaging: false,
+                filter: { filters: [{ value:"ContactName", operator:"eq", field:"test"}], logic: "or" },
+                group: [{
+                    field: 'ShipAddress'
+                }, {
+                    field: 'ContactName'
+                }],
+                groupPaging: true
+            });
+
+            var result = dataSource._composeItemsFilter({field: 'ShipAddress', value:'test'});
+            assert.equal(result.logic, "and");
+        });
+
         it("_composeItemsFilter should create a filter object which contains the values of the parent groups", function () {
             var dataSource = remoteDataSource(null, {
                 total: 100,

tests/pager/aria.js

@@ -49,6 +49,12 @@
             assert.equal(element.find(".k-pager-numbers .k-link:eq(0)").attr("aria-label"), "Page 1");
         });
 
+        it("selected page button should have role button", function() {
+            var element = setup(null, { navigatable: true, numeric: true });
+            pager.page(1);
+            assert.equal(element.find(".k-pager-numbers .k-link:eq(0)").attr("role"), "button");
+        });
+
         it("pager element should have aria-label", function() {
             var element = setup(null, { navigatable: true, numeric: true });
             pager.page(1);