Merge pull request #18091 from owncloud/add-backbonejs

Add Backbone.js

bower.json

@@ -26,6 +26,7 @@
     "snapjs": "~2.0.0-rc1",
     "strengthify": "0.4.1",
     "underscore": "~1.8.0",
-    "bootstrap": "~3.3.5"
+    "bootstrap": "~3.3.5",
+    "backbone": "~1.2.1"
   }
 }

core/js/oc-backbone.js

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+if(!_.isUndefined(Backbone)) {
+	OC.Backbone = Backbone.noConflict();
+}

core/vendor/.gitignore

@@ -119,3 +119,6 @@ bootstrap/**
 !bootstrap/js
 bootstrap/js/*
 !bootstrap/js/tooltip.js
+
+# backbone
+backbone/backbone-min*

core/vendor/backbone/.bower.json

@@ -0,0 +1,33 @@
+{
+  "name": "backbone",
+  "version": "1.2.1",
+  "main": "backbone.js",
+  "dependencies": {
+    "underscore": ">=1.7.0"
+  },
+  "ignore": [
+    "docs",
+    "examples",
+    "test",
+    "*.yml",
+    "*.html",
+    "*.ico",
+    "*.md",
+    "CNAME",
+    ".*",
+    "karma.*",
+    "component.json",
+    "package.json"
+  ],
+  "homepage": "https://github.com/jashkenas/backbone",
+  "_release": "1.2.1",
+  "_resolution": {
+    "type": "version",
+    "tag": "1.2.1",
+    "commit": "938a8ff934fd4de4f0009f68d43f500f5920b490"
+  },
+  "_source": "git://github.com/jashkenas/backbone.git",
+  "_target": "~1.2.1",
+  "_originalSource": "backbone",
+  "_direct": true
+}

core/vendor/backbone/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2010-2015 Jeremy Ashkenas, DocumentCloud
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

lib/base.php

@@ -407,6 +407,8 @@ class OC {
 		OC_Util::addScript('mimetype');
 		OC_Util::addScript('mimetypelist');
 		OC_Util::addVendorScript('snapjs/dist/latest/snap');
+		OC_Util::addVendorScript('core', 'backbone/backbone');
+		OC_Util::addScript('oc-backbone');
 
 		// avatars
 		if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) {