From da4ba82b834f3485e82113b7cb6d1c5bd68ec315 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 23 Jun 2016 18:26:01 +0200
Subject: [PATCH] Use OC.Backbone instead of Backbone directly in authtoken JS
code
Fixes asset pipeline issue with the auth token in personal page
---
settings/js/authtoken.js | 6 +++---
settings/js/authtoken_collection.js | 6 +++---
settings/js/authtoken_view.js | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/settings/js/authtoken.js b/settings/js/authtoken.js
index 215192d7163..1d958a4d675 100644
--- a/settings/js/authtoken.js
+++ b/settings/js/authtoken.js
@@ -20,14 +20,14 @@
*
*/
-(function(OC, Backbone) {
+(function(OC) {
'use strict';
OC.Settings = OC.Settings || {};
- var AuthToken = Backbone.Model.extend({
+ var AuthToken = OC.Backbone.Model.extend({
});
OC.Settings.AuthToken = AuthToken;
-})(OC, Backbone);
+})(OC);
diff --git a/settings/js/authtoken_collection.js b/settings/js/authtoken_collection.js
index a78e053995f..ab7f7d5804a 100644
--- a/settings/js/authtoken_collection.js
+++ b/settings/js/authtoken_collection.js
@@ -20,12 +20,12 @@
*
*/
-(function(OC, Backbone) {
+(function(OC) {
'use strict';
OC.Settings = OC.Settings || {};
- var AuthTokenCollection = Backbone.Collection.extend({
+ var AuthTokenCollection = OC.Backbone.Collection.extend({
model: OC.Settings.AuthToken,
@@ -49,4 +49,4 @@
OC.Settings.AuthTokenCollection = AuthTokenCollection;
-})(OC, Backbone);
+})(OC);
diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js
index da5861689a0..bfafee8243f 100644
--- a/settings/js/authtoken_view.js
+++ b/settings/js/authtoken_view.js
@@ -1,4 +1,4 @@
-/* global Backbone, Handlebars, moment */
+/* global Handlebars, moment */
/**
* @author Christoph Wurst <christoph@owncloud.com>
@@ -20,7 +20,7 @@
*
*/
-(function(OC, _, Backbone, $, Handlebars, moment) {
+(function(OC, _, $, Handlebars, moment) {
'use strict';
OC.Settings = OC.Settings || {};
@@ -32,7 +32,7 @@
+ '<td><a class="icon-delete has-tooltip" title="' + t('core', 'Disconnect') + '"></a></td>'
+ '<tr>';
- var SubView = Backbone.View.extend({
+ var SubView = OC.Backbone.View.extend({
collection: null,
/**
@@ -94,7 +94,7 @@
}
});
- var AuthTokenView = Backbone.View.extend({
+ var AuthTokenView = OC.Backbone.View.extend({
collection: null,
_views: [],
@@ -237,4 +237,4 @@
OC.Settings.AuthTokenView = AuthTokenView;
-})(OC, _, Backbone, $, Handlebars, moment);
+})(OC, _, $, Handlebars, moment);
--
GitLab