Skip to content

Commit

Permalink
Merge pull request #1081 from nextcloud/feat/addScript-dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Dec 2, 2021
2 parents 57d0b64 + 69668aa commit 1d3c4de
Show file tree
Hide file tree
Showing 9 changed files with 2,454 additions and 2,550 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = {
globals: {
appName: true,
appVersion: true,
isTesting: true,
PLYR_ICONS: true,
Expand Down
4 changes: 2 additions & 2 deletions js/viewer-main.js

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions js/viewer-main.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,9 @@ object-assign
*/

/**
* @copyright Copyright (c) 2019 Marco Ambrosini <marcoambrosini@pm.me>
* @copyright Copyright (c) 2020 Azul <azul@riseup.net>
*
* @author Marco Ambrosini <marcoambrosini@pm.me>
* @author John Molakvoæ <skjnldsv@protonmail.com>
* @author Azul <azul@riseup.net>
*
* @license GNU AGPL version 3 or any later version
*
Expand All @@ -202,9 +201,9 @@ object-assign
*/

/**
* @copyright Copyright (c) 2020 Azul <azul@riseup.net>
* @copyright Copyright (c) 2021 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author Azul <azul@riseup.net>
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
Expand Down
2 changes: 1 addition & 1 deletion js/viewer-main.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/Listener/LoadViewerScript.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ public function handle(Event $event): void {
return;
}

Util::addScript(Application::APP_ID, 'viewer-main');
Util::addScript(Application::APP_ID, 'viewer-main', 'files');
}
}
Loading

0 comments on commit 1d3c4de

Please sign in to comment.