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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2ea79e09
Commit
2ea79e09
authored
Nov 14, 2017
by
Filipa Lacerda
Committed by
Phil Hughes
Nov 14, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Export project, projectAvatar and projectImport as ES6 modules
parent
74344616
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
151 additions
and
173 deletions
+151
-173
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+6
-6
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+0
-2
app/assets/javascripts/project.js
app/assets/javascripts/project.js
+127
-135
app/assets/javascripts/project_avatar.js
app/assets/javascripts/project_avatar.js
+12
-19
app/assets/javascripts/project_import.js
app/assets/javascripts/project_import.js
+6
-11
No files found.
app/assets/javascripts/dispatcher.js
View file @
2ea79e09
...
...
@@ -20,8 +20,8 @@ import groupsSelect from './groups_select';
import
NamespaceSelect
from
'
./namespace_select
'
;
/* global NewCommitForm */
/* global NewBranchForm */
/* global Project */
/* global ProjectAvatar */
import
Project
from
'
./project
'
;
import
projectAvatar
from
'
./project_avatar
'
;
/* global MergeRequest */
/* global Compare */
/* global CompareAutocomplete */
...
...
@@ -29,7 +29,7 @@ import NamespaceSelect from './namespace_select';
/* global ProjectFindFile */
/* global ProjectNew */
/* global ProjectShow */
/* global ProjectImport */
import
projectImport
from
'
./project_import
'
;
import
Labels
from
'
./labels
'
;
import
LabelManager
from
'
./label_manager
'
;
/* global Sidebar */
...
...
@@ -386,7 +386,7 @@ import initGroupAnalytics from './init_group_analytics';
GpgBadges
.
fetch
();
break
;
case
'
projects:imports:show
'
:
new
P
rojectImport
();
p
rojectImport
();
break
;
case
'
projects:show
'
:
shortcut_handler
=
new
ShortcutsNavigation
();
...
...
@@ -416,7 +416,7 @@ import initGroupAnalytics from './init_group_analytics';
new
UserCallout
({
className
:
'
js-mr-approval-callout
'
});
break
;
case
'
projects:imports:show
'
:
new
P
rojectImport
();
p
rojectImport
();
break
;
case
'
projects:pipelines:new
'
:
new
NewBranchForm
(
$
(
'
.js-new-pipeline-form
'
));
...
...
@@ -686,7 +686,7 @@ import initGroupAnalytics from './init_group_analytics';
break
;
case
'
projects
'
:
new
Project
();
new
P
rojectAvatar
();
p
rojectAvatar
();
switch
(
path
[
1
])
{
case
'
compare
'
:
new
CompareAutocomplete
();
...
...
app/assets/javascripts/main.js
View file @
2ea79e09
...
...
@@ -72,8 +72,6 @@ import './notifications_dropdown';
import
'
./notifications_form
'
;
import
'
./pager
'
;
import
'
./preview_markdown
'
;
import
'
./project
'
;
import
'
./project_avatar
'
;
import
'
./project_find_file
'
;
import
'
./project_import
'
;
import
'
./project_label_subscription
'
;
...
...
app/assets/javascripts/project.js
View file @
2ea79e09
/* eslint-disable func-names, space-before-function-paren,
wrap-iife, no-var, quotes, consistent-return, no-new, prefer-arrow-callback, no-return-assign, one-var, one-var-declaration-per-line, object-shorthand, comma-dangle
, no-else-return, newline-per-chained-call, no-shadow, vars-on-top, prefer-template, max-len */
/* eslint-disable func-names, space-before-function-paren,
no-var, consistent-return, no-new, prefer-arrow-callback, no-return-assign, one-var, one-var-declaration-per-line, object-shorthand
, no-else-return, newline-per-chained-call, no-shadow, vars-on-top, prefer-template, max-len */
/* global ProjectSelect */
import
Cookies
from
'
js-cookie
'
;
(
function
()
{
this
.
Project
=
(
function
()
{
function
Project
()
{
const
$cloneOptions
=
$
(
'
ul.clone-options-dropdown
'
);
const
$projectCloneField
=
$
(
'
#project_clone
'
);
const
$cloneBtnText
=
$
(
'
a.clone-dropdown-btn span
'
);
export
default
class
Project
{
constructor
()
{
const
$cloneOptions
=
$
(
'
ul.clone-options-dropdown
'
);
const
$projectCloneField
=
$
(
'
#project_clone
'
);
const
$cloneBtnText
=
$
(
'
a.clone-dropdown-btn span
'
);
const
selectedCloneOption
=
$cloneBtnText
.
text
().
trim
();
if
(
selectedCloneOption
.
length
>
0
)
{
$
(
`a:contains('
${
selectedCloneOption
}
')`
,
$cloneOptions
).
addClass
(
'
is-active
'
);
}
$
(
'
a
'
,
$cloneOptions
).
on
(
'
click
'
,
(
e
)
=>
{
const
$this
=
$
(
e
.
currentTarget
);
const
url
=
$this
.
attr
(
'
href
'
);
const
selectedCloneOption
=
$cloneBtnText
.
text
().
trim
();
if
(
selectedCloneOption
.
length
>
0
)
{
$
(
`a:contains('
${
selectedCloneOption
}
')`
,
$cloneOptions
).
addClass
(
'
is-active
'
);
}
e
.
preventDefault
();
$
(
'
a
'
,
$cloneOptions
).
on
(
'
click
'
,
(
e
)
=>
{
const
$this
=
$
(
e
.
currentTarget
);
const
url
=
$this
.
attr
(
'
href
'
);
$
(
'
.is-active
'
,
$cloneOptions
).
not
(
$this
).
removeClass
(
'
is-active
'
);
$this
.
toggleClass
(
'
is-active
'
);
$projectCloneField
.
val
(
url
);
$cloneBtnText
.
text
(
$this
.
text
());
e
.
preventDefault
();
$
(
'
#modal-geo-info
'
).
data
({
cloneUrlSecondary
:
$this
.
attr
(
'
href
'
),
cloneUrlPrimary
:
$this
.
data
(
'
primaryUrl
'
)
||
''
}
);
$
(
'
.is-active
'
,
$cloneOptions
).
not
(
$this
).
removeClass
(
'
is-active
'
);
$this
.
toggleClass
(
'
is-active
'
);
$projectCloneField
.
val
(
url
);
$cloneBtnText
.
text
(
$this
.
text
()
);
return
$
(
'
.clone
'
).
text
(
url
);
});
// Ref switcher
this
.
initRefSwitcher
();
$
(
'
.project-refs-select
'
).
on
(
'
change
'
,
function
()
{
return
$
(
this
).
parents
(
'
form
'
).
submit
();
});
$
(
'
.hide-no-ssh-message
'
).
on
(
'
click
'
,
function
(
e
)
{
Cookies
.
set
(
'
hide_no_ssh_message
'
,
'
false
'
);
$
(
this
).
parents
(
'
.no-ssh-key-message
'
).
remove
();
return
e
.
preventDefault
();
});
$
(
'
.hide-no-password-message
'
).
on
(
'
click
'
,
function
(
e
)
{
Cookies
.
set
(
'
hide_no_password_message
'
,
'
false
'
);
$
(
this
).
parents
(
'
.no-password-message
'
).
remove
();
return
e
.
preventDefault
();
});
$
(
'
.hide-shared-runner-limit-message
'
).
on
(
'
click
'
,
function
(
e
)
{
var
$alert
=
$
(
this
).
parents
(
'
.shared-runner-quota-message
'
);
var
scope
=
$alert
.
data
(
'
scope
'
);
Cookies
.
set
(
'
hide_shared_runner_quota_message
'
,
'
false
'
,
{
path
:
scope
});
$alert
.
remove
();
e
.
preventDefault
();
$
(
'
#modal-geo-info
'
).
data
({
cloneUrlSecondary
:
$this
.
attr
(
'
href
'
),
cloneUrlPrimary
:
$this
.
data
(
'
primaryUrl
'
)
||
''
,
});
this
.
projectSelectDropdown
();
}
Project
.
prototype
.
projectSelectDropdown
=
function
()
{
new
ProjectSelect
();
$
(
'
.project-item-select
'
).
on
(
'
click
'
,
(
function
(
_this
)
{
return
function
(
e
)
{
return
_this
.
changeProject
(
$
(
e
.
currentTarget
).
val
());
};
})(
this
));
};
Project
.
prototype
.
changeProject
=
function
(
url
)
{
return
window
.
location
=
url
;
};
Project
.
prototype
.
initRefSwitcher
=
function
()
{
var
refListItem
=
document
.
createElement
(
'
li
'
);
var
refLink
=
document
.
createElement
(
'
a
'
);
refLink
.
href
=
'
#
'
;
return
$
(
'
.js-project-refs-dropdown
'
).
each
(
function
()
{
var
$dropdown
,
selected
;
$dropdown
=
$
(
this
);
selected
=
$dropdown
.
data
(
'
selected
'
);
return
$dropdown
.
glDropdown
({
data
:
function
(
term
,
callback
)
{
return
$
.
ajax
({
url
:
$dropdown
.
data
(
'
refs-url
'
),
data
:
{
ref
:
$dropdown
.
data
(
'
ref
'
),
search
:
term
},
dataType
:
"
json
"
}).
done
(
function
(
refs
)
{
return
callback
(
refs
);
});
},
selectable
:
true
,
filterable
:
true
,
filterRemote
:
true
,
filterByText
:
true
,
inputFieldName
:
$dropdown
.
data
(
'
input-field-name
'
),
fieldName
:
$dropdown
.
data
(
'
field-name
'
),
renderRow
:
function
(
ref
)
{
var
li
=
refListItem
.
cloneNode
(
false
);
if
(
ref
.
header
!=
null
)
{
li
.
className
=
'
dropdown-header
'
;
li
.
textContent
=
ref
.
header
;
}
else
{
var
link
=
refLink
.
cloneNode
(
false
);
if
(
ref
===
selected
)
{
link
.
className
=
'
is-active
'
;
}
link
.
textContent
=
ref
;
link
.
dataset
.
ref
=
ref
;
li
.
appendChild
(
link
);
return
$
(
'
.clone
'
).
text
(
url
);
});
// Ref switcher
Project
.
initRefSwitcher
();
$
(
'
.project-refs-select
'
).
on
(
'
change
'
,
function
()
{
return
$
(
this
).
parents
(
'
form
'
).
submit
();
});
$
(
'
.hide-no-ssh-message
'
).
on
(
'
click
'
,
function
(
e
)
{
Cookies
.
set
(
'
hide_no_ssh_message
'
,
'
false
'
);
$
(
this
).
parents
(
'
.no-ssh-key-message
'
).
remove
();
return
e
.
preventDefault
();
});
$
(
'
.hide-no-password-message
'
).
on
(
'
click
'
,
function
(
e
)
{
Cookies
.
set
(
'
hide_no_password_message
'
,
'
false
'
);
$
(
this
).
parents
(
'
.no-password-message
'
).
remove
();
return
e
.
preventDefault
();
});
$
(
'
.hide-shared-runner-limit-message
'
).
on
(
'
click
'
,
function
(
e
)
{
var
$alert
=
$
(
this
).
parents
(
'
.shared-runner-quota-message
'
);
var
scope
=
$alert
.
data
(
'
scope
'
);
Cookies
.
set
(
'
hide_shared_runner_quota_message
'
,
'
false
'
,
{
path
:
scope
});
$alert
.
remove
();
e
.
preventDefault
();
});
Project
.
projectSelectDropdown
();
}
static
projectSelectDropdown
()
{
new
ProjectSelect
();
$
(
'
.project-item-select
'
).
on
(
'
click
'
,
e
=>
Project
.
changeProject
(
$
(
e
.
currentTarget
).
val
()));
}
static
changeProject
(
url
)
{
return
window
.
location
=
url
;
}
static
initRefSwitcher
()
{
var
refListItem
=
document
.
createElement
(
'
li
'
);
var
refLink
=
document
.
createElement
(
'
a
'
);
refLink
.
href
=
'
#
'
;
return
$
(
'
.js-project-refs-dropdown
'
).
each
(
function
()
{
var
$dropdown
,
selected
;
$dropdown
=
$
(
this
);
selected
=
$dropdown
.
data
(
'
selected
'
);
return
$dropdown
.
glDropdown
({
data
:
function
(
term
,
callback
)
{
return
$
.
ajax
({
url
:
$dropdown
.
data
(
'
refs-url
'
),
data
:
{
ref
:
$dropdown
.
data
(
'
ref
'
),
search
:
term
,
},
dataType
:
'
json
'
,
}).
done
(
function
(
refs
)
{
return
callback
(
refs
);
});
},
selectable
:
true
,
filterable
:
true
,
filterRemote
:
true
,
filterByText
:
true
,
inputFieldName
:
$dropdown
.
data
(
'
input-field-name
'
),
fieldName
:
$dropdown
.
data
(
'
field-name
'
),
renderRow
:
function
(
ref
)
{
var
li
=
refListItem
.
cloneNode
(
false
);
if
(
ref
.
header
!=
null
)
{
li
.
className
=
'
dropdown-header
'
;
li
.
textContent
=
ref
.
header
;
}
else
{
var
link
=
refLink
.
cloneNode
(
false
);
if
(
ref
===
selected
)
{
link
.
className
=
'
is-active
'
;
}
return
li
;
},
id
:
function
(
obj
,
$el
)
{
return
$el
.
attr
(
'
data-ref
'
);
},
toggleLabel
:
function
(
obj
,
$el
)
{
return
$el
.
text
().
trim
();
},
clicked
:
function
(
options
)
{
const
{
e
}
=
options
;
e
.
preventDefault
();
if
(
$
(
'
input[name="ref"]
'
).
length
)
{
var
$form
=
$dropdown
.
closest
(
'
form
'
);
var
$visit
=
$dropdown
.
data
(
'
visit
'
);
var
shouldVisit
=
$visit
?
true
:
$visit
;
var
action
=
$form
.
attr
(
'
action
'
);
var
divider
=
action
.
indexOf
(
'
?
'
)
===
-
1
?
'
?
'
:
'
&
'
;
if
(
shouldVisit
)
{
gl
.
utils
.
visitUrl
(
`
${
action
}${
divider
}${
$form
.
serialize
()}
`
);
}
link
.
textContent
=
ref
;
link
.
dataset
.
ref
=
ref
;
li
.
appendChild
(
link
);
}
return
li
;
},
id
:
function
(
obj
,
$el
)
{
return
$el
.
attr
(
'
data-ref
'
);
},
toggleLabel
:
function
(
obj
,
$el
)
{
return
$el
.
text
().
trim
();
},
clicked
:
function
(
options
)
{
const
{
e
}
=
options
;
e
.
preventDefault
();
if
(
$
(
'
input[name="ref"]
'
).
length
)
{
var
$form
=
$dropdown
.
closest
(
'
form
'
);
var
$visit
=
$dropdown
.
data
(
'
visit
'
);
var
shouldVisit
=
$visit
?
true
:
$visit
;
var
action
=
$form
.
attr
(
'
action
'
);
var
divider
=
action
.
indexOf
(
'
?
'
)
===
-
1
?
'
?
'
:
'
&
'
;
if
(
shouldVisit
)
{
gl
.
utils
.
visitUrl
(
`
${
action
}${
divider
}${
$form
.
serialize
()}
`
);
}
}
}
);
}
,
});
};
return
Project
;
})();
}).
call
(
window
);
});
}
}
app/assets/javascripts/project_avatar.js
View file @
2ea79e09
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, one-var, one-var-declaration-per-line, no-useless-escape, max-len */
(
function
()
{
this
.
ProjectAvatar
=
(
function
()
{
function
ProjectAvatar
()
{
$
(
'
.js-choose-project-avatar-button
'
).
bind
(
'
click
'
,
function
()
{
var
form
;
form
=
$
(
this
).
closest
(
'
form
'
);
return
form
.
find
(
'
.js-project-avatar-input
'
).
click
();
});
$
(
'
.js-project-avatar-input
'
).
bind
(
'
change
'
,
function
()
{
var
filename
,
form
;
form
=
$
(
this
).
closest
(
'
form
'
);
filename
=
$
(
this
).
val
().
replace
(
/^.*
[\\\/]
/
,
''
);
return
form
.
find
(
'
.js-avatar-filename
'
).
text
(
filename
);
});
}
export
default
function
projectAvatar
()
{
$
(
'
.js-choose-project-avatar-button
'
).
bind
(
'
click
'
,
function
onClickAvatar
()
{
const
form
=
$
(
this
).
closest
(
'
form
'
);
return
form
.
find
(
'
.js-project-avatar-input
'
).
click
();
});
return
ProjectAvatar
;
})();
}).
call
(
window
);
$
(
'
.js-project-avatar-input
'
).
bind
(
'
change
'
,
function
onClickAvatarInput
()
{
const
form
=
$
(
this
).
closest
(
'
form
'
);
// eslint-disable-next-line no-useless-escape
const
filename
=
$
(
this
).
val
().
replace
(
/^.*
[\\\/]
/
,
''
);
return
form
.
find
(
'
.js-avatar-filename
'
).
text
(
filename
);
});
}
app/assets/javascripts/project_import.js
View file @
2ea79e09
/* eslint-disable func-names, space-before-function-paren, wrap-iife, prefer-arrow-callback, max-len */
import
{
visitUrl
}
from
'
./lib/utils/url_utility
'
;
(
function
()
{
this
.
ProjectImport
=
(
function
()
{
function
ProjectImport
()
{
setTimeout
(
function
()
{
return
gl
.
utils
.
visitUrl
(
location
.
href
);
},
5000
);
}
export
default
function
projectImport
()
{
setTimeout
(()
=>
{
visitUrl
(
location
.
href
);
},
5000
);
}
return
ProjectImport
;
})();
}).
call
(
window
);
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