From: Roeland Jago Douma <rullzer@users.noreply.github.com>
Date: Wed, 22 Mar 2017 12:34:21 +0000 (+0100)
Subject: Merge pull request #3795 from nextcloud/bundle_vendor_js
X-Git-Tag: v12.0.0beta1~343
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ec3f5aa6e22be108e75477a28b58cc56299c0b05;p=nextcloud-server.git

Merge pull request #3795 from nextcloud/bundle_vendor_js

Bundle vendor js
---

ec3f5aa6e22be108e75477a28b58cc56299c0b05
diff --cc apps/files/lib/Controller/ViewController.php
index a1f01cb8a38,91ded2b9444..cfe66eb028b
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@@ -176,10 -179,8 +176,8 @@@ class ViewController extends Controlle
  		\OCP\Util::addScript('files', 'detailtabview');
  		\OCP\Util::addScript('files', 'mainfileinfodetailview');
  		\OCP\Util::addScript('files', 'detailsview');
 -		\OCP\Util::addStyle('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');