Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
697967c1
Commit
697967c1
authored
Oct 12, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove members and memberExpirationDate from window object
parent
01903274
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
110 additions
and
120 deletions
+110
-120
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+7
-5
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+0
-2
app/assets/javascripts/member_expiration_date.js
app/assets/javascripts/member_expiration_date.js
+42
-45
app/assets/javascripts/members.js
app/assets/javascripts/members.js
+61
-68
No files found.
app/assets/javascripts/dispatcher.js
View file @
697967c1
...
@@ -81,6 +81,8 @@ import AbuseReports from './abuse_reports';
...
@@ -81,6 +81,8 @@ import AbuseReports from './abuse_reports';
import
{
ajaxGet
,
convertPermissionToBoolean
}
from
'
./lib/utils/common_utils
'
;
import
{
ajaxGet
,
convertPermissionToBoolean
}
from
'
./lib/utils/common_utils
'
;
import
AjaxLoadingSpinner
from
'
./ajax_loading_spinner
'
;
import
AjaxLoadingSpinner
from
'
./ajax_loading_spinner
'
;
import
U2FAuthenticate
from
'
./u2f/authenticate
'
;
import
U2FAuthenticate
from
'
./u2f/authenticate
'
;
import
Members
from
'
./members
'
;
import
memberExpirationDate
from
'
./member_expiration_date
'
;
(
function
()
{
(
function
()
{
var
Dispatcher
;
var
Dispatcher
;
...
@@ -397,15 +399,15 @@ import U2FAuthenticate from './u2f/authenticate';
...
@@ -397,15 +399,15 @@ import U2FAuthenticate from './u2f/authenticate';
new
ProjectsList
();
new
ProjectsList
();
break
;
break
;
case
'
groups:group_members:index
'
:
case
'
groups:group_members:index
'
:
new
gl
.
M
emberExpirationDate
();
m
emberExpirationDate
();
new
gl
.
Members
();
new
Members
();
new
UsersSelect
();
new
UsersSelect
();
break
;
break
;
case
'
projects:project_members:index
'
:
case
'
projects:project_members:index
'
:
new
gl
.
M
emberExpirationDate
(
'
.js-access-expiration-date-groups
'
);
m
emberExpirationDate
(
'
.js-access-expiration-date-groups
'
);
new
GroupsSelect
();
new
GroupsSelect
();
new
gl
.
M
emberExpirationDate
();
m
emberExpirationDate
();
new
gl
.
Members
();
new
Members
();
new
UsersSelect
();
new
UsersSelect
();
break
;
break
;
case
'
groups:new
'
:
case
'
groups:new
'
:
...
...
app/assets/javascripts/main.js
View file @
697967c1
...
@@ -84,8 +84,6 @@ import './layout_nav';
...
@@ -84,8 +84,6 @@ import './layout_nav';
import
LazyLoader
from
'
./lazy_loader
'
;
import
LazyLoader
from
'
./lazy_loader
'
;
import
'
./line_highlighter
'
;
import
'
./line_highlighter
'
;
import
'
./logo
'
;
import
'
./logo
'
;
import
'
./member_expiration_date
'
;
import
'
./members
'
;
import
'
./merge_request
'
;
import
'
./merge_request
'
;
import
'
./merge_request_tabs
'
;
import
'
./merge_request_tabs
'
;
import
'
./milestone
'
;
import
'
./milestone
'
;
...
...
app/assets/javascripts/member_expiration_date.js
View file @
697967c1
...
@@ -2,14 +2,12 @@
...
@@ -2,14 +2,12 @@
import
Pikaday
from
'
pikaday
'
;
import
Pikaday
from
'
pikaday
'
;
(()
=>
{
// Add datepickers to all `js-access-expiration-date` elements. If those elements are
// Add datepickers to all `js-access-expiration-date` elements. If those elements are
// children of an element with the `clearable-input` class, and have a sibling
// children of an element with the `clearable-input` class, and have a sibling
// `js-clear-input` element, then show that element when there is a value in the
// `js-clear-input` element, then show that element when there is a value in the
// datepicker, and make clicking on that element clear the field.
// datepicker, and make clicking on that element clear the field.
//
//
export
default
function
memberExpirationDate
(
selector
=
'
.js-access-expiration-date
'
)
{
window
.
gl
=
window
.
gl
||
{};
gl
.
MemberExpirationDate
=
(
selector
=
'
.js-access-expiration-date
'
)
=>
{
function
toggleClearInput
()
{
function
toggleClearInput
()
{
$
(
this
).
closest
(
'
.clearable-input
'
).
toggleClass
(
'
has-value
'
,
$
(
this
).
val
()
!==
''
);
$
(
this
).
closest
(
'
.clearable-input
'
).
toggleClass
(
'
has-value
'
,
$
(
this
).
val
()
!==
''
);
}
}
...
@@ -51,5 +49,4 @@ import Pikaday from 'pikaday';
...
@@ -51,5 +49,4 @@ import Pikaday from 'pikaday';
inputs
.
on
(
'
blur
'
,
toggleClearInput
);
inputs
.
on
(
'
blur
'
,
toggleClearInput
);
inputs
.
each
(
toggleClearInput
);
inputs
.
each
(
toggleClearInput
);
};
}
}).
call
(
window
);
app/assets/javascripts/members.js
View file @
697967c1
/* eslint-disable class-methods-use-this */
export
default
class
Members
{
(()
=>
{
window
.
gl
=
window
.
gl
||
{};
class
Members
{
constructor
()
{
constructor
()
{
this
.
addListeners
();
this
.
addListeners
();
this
.
initGLDropdown
();
this
.
initGLDropdown
();
...
@@ -37,7 +33,7 @@
...
@@ -37,7 +33,7 @@
});
});
});
});
}
}
// eslint-disable-next-line class-methods-use-this
removeRow
(
e
)
{
removeRow
(
e
)
{
const
$target
=
$
(
e
.
target
);
const
$target
=
$
(
e
.
target
);
...
@@ -65,7 +61,7 @@
...
@@ -65,7 +61,7 @@
$toggle
.
enable
();
$toggle
.
enable
();
$dateInput
.
enable
();
$dateInput
.
enable
();
}
}
// eslint-disable-next-line class-methods-use-this
getMemberListItems
(
$el
)
{
getMemberListItems
(
$el
)
{
const
$memberListItem
=
$el
.
is
(
'
.member
'
)
?
$el
:
$
(
`#
${
$el
.
data
(
'
el-id
'
)}
`
);
const
$memberListItem
=
$el
.
is
(
'
.member
'
)
?
$el
:
$
(
`#
${
$el
.
data
(
'
el-id
'
)}
`
);
...
@@ -75,7 +71,4 @@
...
@@ -75,7 +71,4 @@
$dateInput
:
$memberListItem
.
find
(
'
.js-access-expiration-date
'
),
$dateInput
:
$memberListItem
.
find
(
'
.js-access-expiration-date
'
),
};
};
}
}
}
}
gl
.
Members
=
Members
;
})();
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