Merge pull request #2247 from tnajdek/mendeley-import-institutional-login-fix
Mendeley import institutional login fix
This commit is contained in:
commit
e669eb45a5
2 changed files with 2 additions and 2 deletions
|
@ -857,7 +857,7 @@ var Zotero_File_Interface = new function() {
|
|||
|
||||
this.authenticateMendeleyOnlinePoll = function (win) {
|
||||
if (win && win[0] && win[0].location) {
|
||||
const matchResult = win[0].location.toString().match(/(?:\?|&)code=(.*?)(?:&|$)/i);
|
||||
const matchResult = win[0].location.toString().match(/mendeley_oauth_redirect.html(?:.*?)(?:\?|&)code=(.*?)(?:&|$)/i);
|
||||
if (matchResult) {
|
||||
const mendeleyCode = matchResult[1];
|
||||
Zotero.getMainWindow().setTimeout(() => this.showImportWizard({ mendeleyCode }), 0);
|
||||
|
|
|
@ -155,7 +155,7 @@
|
|||
|
||||
<hbox flex="1" id="browser">
|
||||
<vbox id="appcontent" flex="1">
|
||||
<browser id="my-browser" type="content-primary" flex="1"/>
|
||||
<browser id="my-browser" type="content" flex="1"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</window>
|
||||
|
|
Loading…
Reference in a new issue