pengjunjie/onlyoffice.github.io
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/onlyoffice.github.io.git synced 2026-04-07 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hiding the search loader on the first response to a query

Browse Source
This commit is contained in:
Artur
2025-12-22 18:48:06 +03:00
parent 31a9a27473
commit 48aae69f8a
5 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sdkjs-plugins/content/zotero/dist/bundle.modern.js vendored
View File

@ -5980,7 +5980,7 @@ function SearchFilterComponents() {
this._searchField = new InputField("searchField", {
type: "text",
autofocus: true,
showClear: true
showClear: false
});
this._filterButton = new Button("filterButton", {
variant: "secondary-icon",
@ -6661,15 +6661,11 @@ SelectCitationsComponent.prototype.count = function() {
var groups = selectedGroups.filter(function(group) {
return group !== "my_library" && group !== "group_libraries";
});
var bShowLoader = true;
var hideLoader = !groups.length;
if (selectedGroups.indexOf("my_library") !== -1) {
promises.push(loadLibrary(sdk.getItems(text), bShowLoader, hideLoader, false));
promises.push(loadLibrary(sdk.getItems(text), false));
}
for (var i = 0; i < groups.length; i++) {
bShowLoader = i === 0 && promises.length === 0;
hideLoader = i === groups.length - 1;
promises.push(loadLibrary(sdk.getGroupItems(text, groups[i]), bShowLoader, hideLoader, true));
promises.push(loadLibrary(sdk.getGroupItems(text, groups[i]), true));
}
lastSearch.text = text;
lastSearch.obj = null;
@ -6683,6 +6679,12 @@ SelectCitationsComponent.prototype.count = function() {
var groupsHash = selectedGroups.join(",");
if (elements.mainState.classList.contains(displayNoneClass) || !text || text == lastSearch.text && groupsHash === lastSearch.groupsHash || selectedGroups.length === 0) return;
searchFor(text, selectedGroups, groupsHash).catch(() => []).then(function(promises) {
if (promises.length) {
libLoader.show();
Promise.any(promises).then(function() {
libLoader.hide();
});
}
return Promise.allSettled(promises);
}).then(function(numOfShownByLib) {
var numOfShown = 0;
@ -6866,10 +6868,10 @@ SelectCitationsComponent.prototype.count = function() {
function loadMore() {
console.warn("Loading more...");
if (lastSearch.obj && lastSearch.obj.next) {
loadLibrary(lastSearch.obj.next(), true, !lastSearch.groups.length, false);
loadLibrary(lastSearch.obj.next(), false);
}
for (var i = 0; i < lastSearch.groups.length && lastSearch.groups[i].next; i++) {
loadLibrary(sdk.getGroupItems(lastSearch.groups[i].next(), lastSearch.groups[i].id), false, i == lastSearch.groups.length - 1, true);
loadLibrary(sdk.getGroupItems(lastSearch.groups[i].next(), lastSearch.groups[i].id), true);
}
}
function shouldLoadMore(holder) {
@ -6885,8 +6887,7 @@ SelectCitationsComponent.prototype.count = function() {
if (!lastSearch.obj && !lastSearch.text.trim() && !lastSearch.groups.length) return false;
return true;
}
function loadLibrary(promise, bShowLoader, hideLoader, isGroup) {
if (bShowLoader) libLoader.show();
function loadLibrary(promise, isGroup) {
return promise.then(function(res) {
return displaySearchItems(res, null, isGroup);
}).catch(function(err) {
@ -6896,9 +6897,6 @@ SelectCitationsComponent.prototype.count = function() {
}
return displaySearchItems(null, err, isGroup);
}).then(function(numOfShown) {
if (hideLoader) {
libLoader.hide();
}
return numOfShown;
});
}

2
sdkjs-plugins/content/zotero/dist/bundle.modern.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
sdkjs-plugins/content/zotero/index.html
View File

@ -28,7 +28,7 @@
<script src="https://onlyoffice.github.io/sdkjs-plugins/v1/plugins-ui.js"></script>
<script src="dist/citeproc_commonjs.js"></script>
<script>
if (typeof Promise === 'function' && typeof Promise.allSettled === 'function') {
if (typeof Promise === 'function' && typeof Promise.any === 'function') {
document.write(
'<script type="module" src="dist/bundle.modern.js"><\/script>'
);

39
sdkjs-plugins/content/zotero/src/app/index.js
View File

@ -207,28 +207,14 @@ import "../styles.css";
);
});
let bShowLoader = true;
let hideLoader = !groups.length;
if (selectedGroups.indexOf("my_library") !== -1) {
promises.push(
loadLibrary(
sdk.getItems(text),
bShowLoader,
hideLoader,
false
)
);
promises.push(loadLibrary(sdk.getItems(text), false));
}
for (var i = 0; i < groups.length; i++) {
bShowLoader = i === 0 && promises.length === 0;
hideLoader = i === groups.length - 1;
promises.push(
loadLibrary(
sdk.getGroupItems(text, groups[i]),
bShowLoader,
hideLoader,
true
)
);
@ -257,6 +243,12 @@ import "../styles.css";
return [];
})
.then(function (promises) {
if (promises.length) {
libLoader.show();
Promise.any(promises).then(function () {
libLoader.hide();
});
}
return Promise.allSettled(promises);
})
.then(function (
@ -506,12 +498,7 @@ import "../styles.css";
function loadMore() {
console.warn("Loading more...");
if (lastSearch.obj && lastSearch.obj.next) {
loadLibrary(
lastSearch.obj.next(),
true,
!lastSearch.groups.length,
false
);
loadLibrary(lastSearch.obj.next(), false);
}
for (
@ -524,8 +511,6 @@ import "../styles.css";
lastSearch.groups[i].next(),
lastSearch.groups[i].id
),
false,
i == lastSearch.groups.length - 1,
true
);
}
@ -558,13 +543,10 @@ import "../styles.css";
/**
* @param {Promise<SearchResult>} promise
* @param {boolean} bShowLoader
* @param {boolean} hideLoader
* @param {boolean} isGroup
* @returns {Promise<number>}
*/
function loadLibrary(promise, bShowLoader, hideLoader, isGroup) {
if (bShowLoader) libLoader.show();
function loadLibrary(promise, isGroup) {
return promise
.then(function (res) {
return displaySearchItems(res, null, isGroup);
@ -577,9 +559,6 @@ import "../styles.css";
return displaySearchItems(null, err, isGroup);
})
.then(function (numOfShown) {
if (hideLoader) {
libLoader.hide();
}
return numOfShown;
});
}

2
sdkjs-plugins/content/zotero/src/app/shared/ui/search-filter.js
View File

@ -41,7 +41,7 @@ function SearchFilterComponents() {
this._searchField = new InputField("searchField", {
type: "text",
autofocus: true,
showClear: true,
showClear: false,
});
this._filterButton = new Button("filterButton", {
variant: "secondary-icon",