summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bower.json1
-rw-r--r--core/vendor/.gitignore4
-rw-r--r--core/vendor/handlebars/handlebars.js (renamed from core/js/handlebars-v1.3.0.js)0
-rw-r--r--settings/apps.php2
4 files changed, 6 insertions, 1 deletions
diff --git a/bower.json b/bower.json
index ab8340c42e9..7f31f762752 100644
--- a/bower.json
+++ b/bower.json
@@ -13,6 +13,7 @@
"tests"
],
"dependencies": {
+ "handlebars": "1.3.0",
"jquery": "~1.10.0",
"moment": "~2.8.3"
}
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index 1c303c1765f..ca64a8539ee 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -14,3 +14,7 @@ moment/*.md
jquery/**
!jquery/jquery*
!jquery/MIT-LICENSE.txt
+
+# handlebars
+handlebars/**
+!handlebars/handlebars.js
diff --git a/core/js/handlebars-v1.3.0.js b/core/vendor/handlebars/handlebars.js
index bec7085c510..bec7085c510 100644
--- a/core/js/handlebars-v1.3.0.js
+++ b/core/vendor/handlebars/handlebars.js
diff --git a/settings/apps.php b/settings/apps.php
index 2d6f3c4c697..c1e3e51bd79 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -25,7 +25,7 @@ OC_Util::checkAdminUser();
\OC::$server->getSession()->close();
// Load the files we need
-\OCP\Util::addScript('handlebars-v1.3.0');
+\OC_Util::addVendorScript('handlebars/handlebars');
\OCP\Util::addScript("settings", "settings");
\OCP\Util::addStyle("settings", "settings");
\OCP\Util::addScript('core', 'select2/select2');