v3.0.10

Author: KloakIT

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "conet",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "license": "MIT",
   "description": "CoNET",
   "repository": {

app/public/scripts/appsManager.js

@@ -745,7 +745,8 @@ const _appScript = {
         self.showResultItems(self, self.searchItemsArray());
     },
     searchNext: (self, event) => {
-        if (self.moreResultsButtomLoading()) {
+        const nextLink = self.searchItem().nextPage;
+        if (self.moreResultsButtomLoading() || !nextLink) {
             return;
         }
         self.moreResultsButtomLoading(true);
@@ -754,7 +755,6 @@ const _appScript = {
             self.nextButtonErrorIndex(_view.connectInformationMessage.getErrorIndex(err));
             self.nextButtonShowError(true);
         }
-        const nextLink = self.searchItem().nextPage;
         let currentArray = null;
         const com = {
             command: 'CoSearch',
@@ -776,7 +776,7 @@ const _appScript = {
                 break;
             }
             case 2: {
-                com.subCom = 'imageNext';
+                com.subCom = 'imageSearchNext';
                 currentArray = self.imageItemsArray();
                 break;
             }

app/public/scripts/appsManager.ts

@@ -840,8 +840,8 @@ const _appScript = {
 	},
 
 	searchNext: ( self, event ) => {
-
-		if ( self.moreResultsButtomLoading ()) {
+		const nextLink = self.searchItem().nextPage
+		if ( self.moreResultsButtomLoading () || !nextLink ) {
 			return
 		}
 
@@ -856,7 +856,7 @@ const _appScript = {
 
 		}
 
-		const nextLink = self.searchItem().nextPage
+		
 
 		let currentArray = null
 		const com: QTGateAPIRequestCommand = {
@@ -881,7 +881,7 @@ const _appScript = {
 			}
 
 			case 2: {
-				com.subCom = 'imageNext'
+				com.subCom = 'imageSearchNext'
 				currentArray = self.imageItemsArray()
 				break
 			}
@@ -919,9 +919,9 @@ const _appScript = {
 			self.nextButtonConetResponse ( false )
 			const args = com.Args
 			self.returnSearchResultItemsInit ( args.param )
-                currentArray.Result.push ( ...args.param.Result )
-                currentArray.nextPage = args.param.nextPage
-                return self.showResultItems ( self, currentArray )
+			currentArray.Result.push ( ...args.param.Result )
+			currentArray.nextPage = args.param.nextPage
+			return self.showResultItems ( self, currentArray )
 
 		})
 

app/views/Shared/appHtml.pug

@@ -589,7 +589,7 @@
 						.space
 						<!-- /ko -->
 
-						<!-- ko ifnot: nextButtonShowError -->
+						<!-- ko if: !nextButtonShowError() && searchItem().nextPage -->
 						button.ui.large.button( data-bind = "css: { 'loading buttonUnActive': moreResultsButtomLoading,  negative: nextButtonShowError, 'loadingGetResponse': nextButtonLoadingGetResponse, 'conetResponse': nextButtonConetResponse },text: info.moreResults[ $root.languageIndex() ], click: searchNext" style="margin-top: 1em;margin-bottom: 2em;" )
 						<!-- /ko -->
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "conet",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "license": "MIT",
   "description": "CoNET platform",
   "scripts": {