Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
4be95374
Commit
4be95374
authored
Jun 27, 2016
by
Vincent Petry
Committed by
GitHub
Jun 27, 2016
Browse files
Merge pull request #25251 from owncloud/authtoken-assetpipelinefix
Use OC.Backbone instead of Backbone directly in authtoken JS code
parents
089fcb45
e2a28db2
Changes
3
Hide whitespace changes
Inline
Side-by-side
settings/js/authtoken.js
View file @
4be95374
...
...
@@ -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
);
settings/js/authtoken_collection.js
View file @
4be95374
...
...
@@ -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
);
settings/js/authtoken_view.js
View file @
4be95374
/* 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
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment