Skip to content

Revert "Bundle vendor js" #3992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Mar 22, 2017
Merged

Revert "Bundle vendor js" #3992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@ pipeline:
when:
matrix:
TESTS: check-autoloader
check-mergejs:
image: nextcloudci/php7.0:php7.0-7
commands:
- bash ./build/mergejschecker.sh
when:
matrix:
TESTS: check-mergejs
app-check-code:
image: nextcloudci/php7.0:php7.0-7
commands:
Expand Down Expand Up @@ -500,7 +493,6 @@ matrix:
- TESTS: integration-ldap-features
- TESTS: jsunit
- TESTS: check-autoloader
- TESTS: check-mergejs
- TESTS: app-check-code
- TESTS: syntax-php5.6
- TESTS: syntax-php7.0
Expand Down
2 changes: 2 additions & 0 deletions apps/files/lib/Controller/ViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
\OCP\Util::addScript('files', 'detailsview');
\OCP\Util::addStyle('files', 'merged');

\OC_Util::addVendorScript('core', 'handlebars/handlebars');

\OCP\Util::addScript('files', 'fileactions');
\OCP\Util::addScript('files', 'fileactionsmenu');
\OCP\Util::addScript('files', 'files');
Expand Down
35 changes: 0 additions & 35 deletions build/mergejs.php
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions build/mergejschecker.sh
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions core/js/core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
"davclient.js/lib/client.js",
"clipboard/dist/clipboard.js",
"autosize/dist/autosize.js",
"DOMPurify/dist/purify.min.js",
"snapjs/dist/latest/snap.js",
"select2/select2.js"
"DOMPurify/dist/purify.min.js"
],
"libraries": [
"jquery-showpassword.js",
Expand Down
42,548 changes: 0 additions & 42,548 deletions core/vendor/core.js
View file
Open in desktop

This file was deleted.

28 changes: 13 additions & 15 deletions lib/private/legacy/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,13 @@ public static function initTemplateEngine($renderAs) {
\OC_Util::addScript('jquery.avatar', null, true);
\OC_Util::addScript('placeholder', null, true);

OC_Util::addVendorScript('select2/select2');
OC_Util::addVendorStyle('select2/select2', null, true);
OC_Util::addScript('select2-toggleselect');

OC_Util::addScript('oc-backbone', null, true);
OC_Util::addVendorScript('core', 'backbone/backbone', true);
OC_Util::addVendorScript('snapjs/dist/latest/snap', null, true);
OC_Util::addScript('mimetypelist', null, true);
OC_Util::addScript('mimetype', null, true);
OC_Util::addScript("apps", null, true);
Expand All @@ -137,24 +140,19 @@ public static function initTemplateEngine($renderAs) {
OC_Util::addScript('files/fileinfo');
OC_Util::addScript('files/client');

if (\OC::$server->getConfig()->getSystemValue('debug')) {
// Add the stuff we need always
// following logic will import all vendor libraries that are
// specified in core/js/core.json
$fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
if($fileContent !== false) {
$coreDependencies = json_decode($fileContent, true);
foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
//remove trailing ".js" as addVendorScript will append it
OC_Util::addVendorScript(
// Add the stuff we need always
// following logic will import all vendor libraries that are
// specified in core/js/core.json
$fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
if($fileContent !== false) {
$coreDependencies = json_decode($fileContent, true);
foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
// remove trailing ".js" as addVendorScript will append it
OC_Util::addVendorScript(
substr($vendorLibrary, 0, strlen($vendorLibrary) - 3),null,true);
}
} else {
throw new \Exception('Cannot read core/js/core.json');
}
} else {
// Import all (combined) default vendor libraries
OC_Util::addVendorScript('core', null, true);
throw new \Exception('Cannot read core/js/core.json');
}

if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) {
Expand Down