diff --git a/chrome.manifest b/chrome.manifest index ed55d767a7..72ca6e2f40 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -43,6 +43,7 @@ locale zotero sr-RS chrome/locale/sr-RS/zotero/ locale zotero sv-SE chrome/locale/sv-SE/zotero/ locale zotero th-TH chrome/locale/th-TH/zotero/ locale zotero tr-TR chrome/locale/tr-TR/zotero/ +locale zotero uk-UA chrome/locale/uk-UA/zotero/ locale zotero vi-VN chrome/locale/vi-VN/zotero/ locale zotero zh-CN chrome/locale/zh-CN/zotero/ locale zotero zh-TW chrome/locale/zh-TW/zotero/ diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css index 7d9898d854..001ef8be24 100644 --- a/chrome/content/zotero-platform/mac/overlay.css +++ b/chrome/content/zotero-platform/mac/overlay.css @@ -128,7 +128,6 @@ -moz-box-orient: vertical; -moz-box-align: center; -moz-appearance: toolbarbutton; - -moz-user-focus: none; text-align: center; margin: 0; padding: 3px 1px 3px 1px; diff --git a/chrome/content/zotero/advancedSearch.js b/chrome/content/zotero/advancedSearch.js index eec434fc8c..4bb5cefe70 100644 --- a/chrome/content/zotero/advancedSearch.js +++ b/chrome/content/zotero/advancedSearch.js @@ -43,6 +43,7 @@ var ZoteroAdvancedSearch = new function() { var sbc = document.getElementById('zotero-search-box-container'); Zotero.setFontSize(sbc); + _searchBox.onLibraryChange = this.onLibraryChange; var io = window.arguments[0]; _searchBox.search = io.dataIn.search; } @@ -50,24 +51,33 @@ var ZoteroAdvancedSearch = new function() { function search() { _searchBox.updateSearch(); + _searchBox.active = true; // A minimal implementation of Zotero.CollectionTreeView var itemGroup = { isSearchMode: function() { return true; }, getItems: function () { - //var search = _searchBox.search.clone(); + var search = _searchBox.search.clone(); - var s2 = new Zotero.Search(); - s2.setScope(_searchBox.search); - - // FIXME: Hack to exclude group libraries for now - var groups = Zotero.Groups.getAll(); - for each(var group in groups) { - s2.addCondition('libraryID', 'isNot', group.libraryID); + // Hack to create a condition for the search's library -- + // this logic should really go in the search itself instead of here + // and in collectionTreeView.js + var conditions = search.getSearchConditions(); + if (!conditions.some(function (condition) condition.condition == 'libraryID')) { + let libraryID = _searchBox.search.libraryID; + // TEMP: libraryIDInt + if (libraryID) { + search.addCondition('libraryID', 'is', libraryID); + } + else { + let groups = Zotero.Groups.getAll(); + for (let i=0; i - - - - - - -