mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25251 from owncloud/authtoken-assetpipelinefix 

Use OC.Backbone instead of Backbone directly in authtoken JS code
This commit is contained in:
Vincent Petry 2016-06-27 09:56:37 +02:00 committed by GitHub
parent 723d0cdfbc da4ba82b83
commit 3a7b9fc41d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings/js/authtoken.js
View File

@ -20,14 +20,14 @@
* *
*/ */
(function(OC, Backbone) { (function(OC) {
'use strict'; 'use strict';
OC.Settings = OC.Settings || {}; OC.Settings = OC.Settings || {};
var AuthToken = Backbone.Model.extend({ var AuthToken = OC.Backbone.Model.extend({
}); });
OC.Settings.AuthToken = AuthToken; OC.Settings.AuthToken = AuthToken;
})(OC, Backbone); })(OC);

6
settings/js/authtoken_collection.js
View File

@ -20,12 +20,12 @@
* *
*/ */
(function(OC, Backbone) { (function(OC) {
'use strict'; 'use strict';
OC.Settings = OC.Settings || {}; OC.Settings = OC.Settings || {};
var AuthTokenCollection = Backbone.Collection.extend({ var AuthTokenCollection = OC.Backbone.Collection.extend({
model: OC.Settings.AuthToken, model: OC.Settings.AuthToken,
@ -49,4 +49,4 @@
OC.Settings.AuthTokenCollection = AuthTokenCollection; OC.Settings.AuthTokenCollection = AuthTokenCollection;
})(OC, Backbone); })(OC);

10
settings/js/authtoken_view.js
View File

@ -1,4 +1,4 @@
/* global Backbone, Handlebars, moment */ /* global Handlebars, moment */
/** /**
* @author Christoph Wurst <christoph@owncloud.com> * @author Christoph Wurst <christoph@owncloud.com>
@ -20,7 +20,7 @@
* *
*/ */
(function(OC, _, Backbone, $, Handlebars, moment) { (function(OC, _, $, Handlebars, moment) {
'use strict'; 'use strict';
OC.Settings = OC.Settings || {}; OC.Settings = OC.Settings || {};
@ -32,7 +32,7 @@
+ '<td><a class="icon-delete has-tooltip" title="' + t('core', 'Disconnect') + '"></a></td>' + '<td><a class="icon-delete has-tooltip" title="' + t('core', 'Disconnect') + '"></a></td>'
+ '<tr>'; + '<tr>';
var SubView = Backbone.View.extend({ var SubView = OC.Backbone.View.extend({
collection: null, collection: null,
/** /**
@ -94,7 +94,7 @@
} }
}); });
var AuthTokenView = Backbone.View.extend({ var AuthTokenView = OC.Backbone.View.extend({
collection: null, collection: null,
_views: [], _views: [],
@ -237,4 +237,4 @@
OC.Settings.AuthTokenView = AuthTokenView; OC.Settings.AuthTokenView = AuthTokenView;
})(OC, _, Backbone, $, Handlebars, moment); })(OC, _, $, Handlebars, moment);