Merge pull request #2 from pkp/master

Zeno Tajoli · web-flow · commit 990337065094 · 2018-10-23T21:34:29.000+02:00
Merge n.2
diff --git a/js/controllers/grid/articleGalleys/ArticleGalleyGridHandler.js b/js/controllers/grid/articleGalleys/ArticleGalleyGridHandler.js
@@ -56,10 +56,13 @@
 			prototype.uploadFileHandler_ = function(sourceElement, event, rowId) {
 
 		// FIXME: Inter-widget messaging is needed here.
-		setTimeout(function() {
-			$('a[id^="component-grid-articlegalleys-articlegalleygrid-row-' + rowId +
-					'-addFile-button-"]').click();
-		}, 0);
+		var selector = 'a[id^="component-grid-articlegalleys-articlegalleygrid-row-' +
+				rowId + '-addFile-button-"]';
+		$.when($(selector)).then(function() {
+			$(function() {
+				$(selector).click();
+			});
+		});
 	};
 
 
diff --git a/js/pkp.min.js b/js/pkp.min.js
diff --git a/lib/pkp b/lib/pkp
@@ -1 +1 @@
-Subproject commit 32056e89fbaebc58ae375387219f838f025f17f8
+Subproject commit 334237230016e84e8a5bf99d4d65cbccb721a717
diff --git a/locale/fi_FI/default.xml b/locale/fi_FI/default.xml
@@ -172,5 +172,5 @@ Noudata seuraavaa protokollaa tehdessäsi elektronisia korjauksia käsikirjoituk
 	<message key="default.groups.abbrev.externalReviewer">A</message>
 	<message key="default.journalSettings.emailSignature"><![CDATA[<br/>
 ________________________________________________________________________<br/>
-<a href="{$ldelim}$contextUrl{$rdelim}">{$ldelim} $contextName {$rdelim}</a>]]></message>
+<a href="{$ldelim}$contextUrl{$rdelim}">{$ldelim}$contextName{$rdelim}</a>]]></message>
 </locale>
diff --git a/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php b/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php
@@ -117,6 +117,7 @@ function createJournalArticleNode($doc, $submission) {
 				$personNameNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'ORCID', $author->getData('orcid')));
 			}
 			$contributorsNode->appendChild($personNameNode);
+			$isFirst = false;
 		}
 		$journalArticleNode->appendChild($contributorsNode);
 
diff --git a/plugins/themes/default/DefaultThemePlugin.inc.php b/plugins/themes/default/DefaultThemePlugin.inc.php
@@ -153,8 +153,8 @@ public function init() {
 			$jqueryUI = '//ajax.googleapis.com/ajax/libs/jqueryui/' . CDN_JQUERY_UI_VERSION . '/jquery-ui' . $min . '.js';
 		} else {
 			// Use OJS's built-in jQuery files
-			$jquery = $request->getBaseUrl() . '/lib/pkp/lib/components/jquery/jquery' . $min . '.js';
-			$jqueryUI = $request->getBaseUrl() . '/lib/pkp/lib/components/jquery-ui/jquery-ui' . $min . '.js';
+			$jquery = $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jquery/jquery' . $min . '.js';
+			$jqueryUI = $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jqueryui/jquery-ui' . $min . '.js';
 		}
 		// Use an empty `baseUrl` argument to prevent the theme from looking for
 		// the files within the theme directory

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ function createJournalArticleNode($doc, $submission) {`
`117`	`117`	`$personNameNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'ORCID', $author->getData('orcid')));`
`118`	`118`	`}`
`119`	`119`	`$contributorsNode->appendChild($personNameNode);`
	`120`	`+ $isFirst = false;`
`120`	`121`	`}`
`121`	`122`	`$journalArticleNode->appendChild($contributorsNode);`
`122`	`123`