@wavemaker/app-ng-runtime 11.14.1-8.6337 → 11.14.1-9.6343

package/scripts/datatable/datatable.js

@@ -507,22 +507,7 @@ $.widget('wm.datatable', {
 
     /* function to get start index of the current active page */
     getPageStartIndex: function() {
-        // Guard against undefined getCurrentPage or getPageSize functions
-        var getCurrentPageFn = this.options.getCurrentPage;
-        var getPageSizeFn = this.options.getPageSize;
-        var currentPage, pagesize;
-        if (!getCurrentPageFn || typeof getCurrentPageFn !== 'function') {
-            // Default to page 1 if getCurrentPage is not available
-            currentPage = 1;
-        } else {
-            currentPage = getCurrentPageFn();
-        }
-        if (!getPageSizeFn || typeof getPageSizeFn !== 'function') {
-            // Default to 10 if getPageSize is not available
-            pagesize = 10;
-        } else {
-            pagesize = getPageSizeFn();
-        }
+        var currentPage = this.options.getCurrentPage(), pagesize = this.options.getPageSize();
         var isPrevPageUpdated = this.options.actionRowPage < currentPage;
         var pageIndex = isPrevPageUpdated ? this.options.actionRowPage : currentPage;
         return ((pageIndex - 1) * pagesize);
@@ -583,8 +568,6 @@ $.widget('wm.datatable', {
         var self = this, preparedData,$tbody,pageStartIndex = self.getPageStartIndex(),
             startRowIndex = self.options.startRowIndex,
             isScrollorOnDemand = self.options.isNavTypeScrollOrOndemand();
-            var $activeRow = self.gridElement.find('tr.row-editing:not(.always-new-row)').first();
-            var index = $activeRow.index();
             if(isScrollorOnDemand) {
                 $tbody = this.gridElement;
                 if(this.renderTableOnViewLess) {
@@ -640,16 +623,6 @@ $.widget('wm.datatable', {
             this.options.setIsDataUpdatedByUser(false);
             this.options.clearActionRowIndex();
         }
-        if(this.options.editmode===this.CONSTANTS.QUICK_EDIT){
-            if (index>=0) {
-                const $newActiveRow = self.gridElement.find('tr').eq(index);
-                if ($newActiveRow && $newActiveRow.length) {
-                    $newActiveRow.addClass('active');
-                    $newActiveRow.trigger('click', [undefined, {action: 'edit', skipFocus:false}]);
-                    self.setActiveRow($newActiveRow);
-                    self.focusActiveRow();
-                }
-            }}
         return $tbody;
     },
 
@@ -1291,9 +1264,7 @@ $.widget('wm.datatable', {
             this.element.find('.loading-data-msg').hide();
             this.element.find('.on-demand-load-btn').text(this.options.ondemandmessage);
             this.element.find('.on-demand-load-btn').show();
-        } else if(this.options.getCurrentPage && typeof this.options.getCurrentPage === 'function' &&
-                   this.options.getPageCount && typeof this.options.getPageCount === 'function' &&
-                   (this.options.getCurrentPage() == this.options.getPageCount()) && this.options.showviewlessbutton) {
+        } else if((this.options.getCurrentPage() == this.options.getPageCount()) && this.options.showviewlessbutton) {
                 this.element.find('.on-demand-load-btn').show().text(this.options.viewlessmessage);
                 this.element.find('.loading-data-msg').hide();
                 if(infScroll) {
@@ -2935,9 +2906,6 @@ $.widget('wm.datatable', {
             $htm.on('focus', 'tr.app-datagrid-row', function (e) {
                 var $row = $(e.currentTarget);
                 if (!$row.hasClass('row-editing')) {
-                    if(e.target===e.currentTarget && (e.which===0||!e.which)) {
-                        return;
-                    }
                     self.toggleEditRow(e, { $row: $row, action: 'edit'});
                 }
             });