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
6a1b84c7
Commit
6a1b84c7
authored
Sep 06, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use modules in common utils
parent
5d952f75
Changes
14
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
779 additions
and
769 deletions
+779
-769
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+5
-4
app/assets/javascripts/behaviors/quick_submit.js
app/assets/javascripts/behaviors/quick_submit.js
+2
-1
app/assets/javascripts/confirm_danger_modal.js
app/assets/javascripts/confirm_danger_modal.js
+2
-1
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+3
-2
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+432
-431
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+2
-1
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+2
-1
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+8
-7
app/assets/javascripts/notes/stores/actions.js
app/assets/javascripts/notes/stores/actions.js
+3
-2
app/assets/javascripts/profile/profile.js
app/assets/javascripts/profile/profile.js
+2
-1
app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
...sets/javascripts/prometheus_metrics/prometheus_metrics.js
+2
-1
app/assets/javascripts/search_autocomplete.js
app/assets/javascripts/search_autocomplete.js
+7
-6
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
...merge_request_widget/components/mr_widget_memory_usage.js
+2
-2
spec/javascripts/lib/utils/common_utils_spec.js
spec/javascripts/lib/utils/common_utils_spec.js
+307
-309
No files found.
app/assets/javascripts/awards_handler.js
View file @
6a1b84c7
...
...
@@ -2,6 +2,7 @@
/* global Flash */
import
_
from
'
underscore
'
;
import
Cookies
from
'
js-cookie
'
;
import
{
isInIssuePage
,
updateTooltipTitle
}
from
'
./lib/utils/common_utils
'
;
const
animationEndEventString
=
'
animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd
'
;
const
transitionEndEventString
=
'
transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd
'
;
...
...
@@ -237,7 +238,7 @@ class AwardsHandler {
addAward
(
votesBlock
,
awardUrl
,
emoji
,
checkMutuality
,
callback
)
{
const
isMainAwardsBlock
=
votesBlock
.
closest
(
'
.js-issue-note-awards
'
).
length
;
if
(
gl
.
utils
.
isInIssuePage
()
&&
!
isMainAwardsBlock
)
{
if
(
isInIssuePage
()
&&
!
isMainAwardsBlock
)
{
const
id
=
votesBlock
.
attr
(
'
id
'
).
replace
(
'
note_
'
,
''
);
$
(
'
.emoji-menu
'
).
removeClass
(
'
is-visible
'
);
...
...
@@ -288,7 +289,7 @@ class AwardsHandler {
}
getVotesBlock
()
{
if
(
gl
.
utils
.
isInIssuePage
())
{
if
(
isInIssuePage
())
{
const
$el
=
$
(
'
.js-add-award.is-active
'
).
closest
(
'
.note.timeline-entry
'
);
if
(
$el
.
length
)
{
...
...
@@ -452,11 +453,11 @@ class AwardsHandler {
userAuthored
(
$emojiButton
)
{
const
oldTitle
=
this
.
getAwardTooltip
(
$emojiButton
);
const
newTitle
=
'
You cannot vote on your own issue, MR and note
'
;
gl
.
utils
.
updateTooltipTitle
(
$emojiButton
,
newTitle
).
tooltip
(
'
show
'
);
updateTooltipTitle
(
$emojiButton
,
newTitle
).
tooltip
(
'
show
'
);
// Restore tooltip back to award list
return
setTimeout
(()
=>
{
$emojiButton
.
tooltip
(
'
hide
'
);
gl
.
utils
.
updateTooltipTitle
(
$emojiButton
,
oldTitle
);
updateTooltipTitle
(
$emojiButton
,
oldTitle
);
},
2800
);
}
...
...
app/assets/javascripts/behaviors/quick_submit.js
View file @
6a1b84c7
import
'
../commons/bootstrap
'
;
import
{
isInIssuePage
}
from
'
../lib/utils/common_utils
'
;
// Quick Submit behavior
//
...
...
@@ -45,7 +46,7 @@ $(document).on('keydown.quick_submit', '.js-quick-submit', (e) => {
if
(
!
$submitButton
.
attr
(
'
disabled
'
))
{
$submitButton
.
trigger
(
'
click
'
,
[
e
]);
if
(
!
gl
.
utils
.
isInIssuePage
())
{
if
(
!
isInIssuePage
())
{
$submitButton
.
disable
();
}
}
...
...
app/assets/javascripts/confirm_danger_modal.js
View file @
6a1b84c7
/* eslint-disable func-names, space-before-function-paren, wrap-iife, one-var, no-var, camelcase, one-var-declaration-per-line, no-else-return, max-len */
import
{
rstrip
}
from
'
./lib/utils/common_utils
'
;
window
.
ConfirmDangerModal
=
(
function
()
{
function
ConfirmDangerModal
(
form
,
text
)
{
...
...
@@ -12,7 +13,7 @@ window.ConfirmDangerModal = (function() {
submit
.
disable
();
$
(
'
.js-confirm-danger-input
'
).
off
(
'
input
'
);
$
(
'
.js-confirm-danger-input
'
).
on
(
'
input
'
,
function
()
{
if
(
gl
.
utils
.
rstrip
(
$
(
this
).
val
())
===
project_path
)
{
if
(
rstrip
(
$
(
this
).
val
())
===
project_path
)
{
return
submit
.
enable
();
}
else
{
return
submit
.
disable
();
...
...
app/assets/javascripts/dispatcher.js
View file @
6a1b84c7
...
...
@@ -77,6 +77,7 @@ import initProjectVisibilitySelector from './project_visibility';
import
GpgBadges
from
'
./gpg_badges
'
;
import
UserFeatureHelper
from
'
./helpers/user_feature_helper
'
;
import
initChangesDropdown
from
'
./init_changes_dropdown
'
;
import
{
ajaxGet
}
from
'
./lib/utils/common_utils
'
;
(
function
()
{
var
Dispatcher
;
...
...
@@ -351,7 +352,7 @@ import initChangesDropdown from './init_changes_dropdown';
if
(
$
(
'
.blob-viewer
'
).
length
)
new
BlobViewer
();
if
(
$
(
'
.project-show-activity
'
).
length
)
new
gl
.
Activities
();
$
(
'
#tree-slider
'
).
waitForImages
(
function
()
{
gl
.
utils
.
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
);
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
);
});
break
;
case
'
projects:edit
'
:
...
...
@@ -427,7 +428,7 @@ import initChangesDropdown from './init_changes_dropdown';
new
NewCommitForm
(
$
(
'
.js-create-dir-form
'
));
new
UserCallout
({
setCalloutPerProject
:
true
});
$
(
'
#tree-slider
'
).
waitForImages
(
function
()
{
gl
.
utils
.
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
);
ajaxGet
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
logsPath
);
});
break
;
case
'
projects:find_file:show
'
:
...
...
app/assets/javascripts/lib/utils/common_utils.js
View file @
6a1b84c7
This diff is collapsed.
Click to expand it.
app/assets/javascripts/merge_request_tabs.js
View file @
6a1b84c7
...
...
@@ -7,6 +7,7 @@ import './flash';
import
BlobForkSuggestion
from
'
./blob/blob_fork_suggestion
'
;
import
initChangesDropdown
from
'
./init_changes_dropdown
'
;
import
bp
from
'
./breakpoints
'
;
import
parseUrlPathname
from
'
./lib/utils/common_utils
'
;
/* eslint-disable max-len */
// MergeRequestTabs
...
...
@@ -260,7 +261,7 @@ import bp from './breakpoints';
// We extract pathname for the current Changes tab anchor href
// some pages like MergeRequestsController#new has query parameters on that anchor
const
urlPathname
=
gl
.
utils
.
parseUrlPathname
(
source
);
const
urlPathname
=
parseUrlPathname
(
source
);
this
.
ajaxGet
({
url
:
`
${
urlPathname
}
.json
${
location
.
search
}
`
,
...
...
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
6a1b84c7
...
...
@@ -8,6 +8,7 @@
import
EmptyState
from
'
./empty_state.vue
'
;
import
MonitoringStore
from
'
../stores/monitoring_store
'
;
import
eventHub
from
'
../event_hub
'
;
import
{
backOff
}
from
'
../../lib/utils/common_utils
'
;
export
default
{
...
...
@@ -41,7 +42,7 @@
getGraphsData
()
{
const
maxNumberOfRequests
=
3
;
this
.
state
=
'
loading
'
;
gl
.
utils
.
backOff
((
next
,
stop
)
=>
{
backOff
((
next
,
stop
)
=>
{
this
.
service
.
get
().
then
((
resp
)
=>
{
if
(
resp
.
status
===
statusCodes
.
NO_CONTENT
)
{
this
.
backOffRequestCounter
=
this
.
backOffRequestCounter
+=
1
;
...
...
app/assets/javascripts/notes.js
View file @
6a1b84c7
...
...
@@ -23,6 +23,7 @@ import loadAwardsHandler from './awards_handler';
import
'
./autosave
'
;
import
'
./dropzone_input
'
;
import
TaskList
from
'
./task_list
'
;
import
{
ajaxPost
,
isInViewport
,
getPagePath
}
from
'
./lib/utils/common_utils
'
;
window
.
autosize
=
autosize
;
window
.
Dropzone
=
Dropzone
;
...
...
@@ -81,7 +82,7 @@ export default class Notes {
this
.
setViewType
(
view
);
// We are in the Merge Requests page so we need another edit form for Changes tab
if
(
g
l
.
utils
.
g
etPagePath
(
1
)
===
'
merge_requests
'
)
{
if
(
getPagePath
(
1
)
===
'
merge_requests
'
)
{
$
(
'
.note-edit-form
'
).
clone
()
.
addClass
(
'
mr-note-edit-form
'
).
insertAfter
(
'
.note-edit-form
'
);
}
...
...
@@ -644,10 +645,10 @@ export default class Notes {
}
else
{
var
$buttons
=
$el
.
find
(
'
.note-form-actions
'
);
var
isWidgetVisible
=
gl
.
utils
.
isInViewport
(
$el
.
get
(
0
));
var
isWidgetVisible
=
isInViewport
(
$el
.
get
(
0
));
if
(
!
isWidgetVisible
)
{
gl
.
utils
.
scrollToElement
(
$el
);
scrollToElement
(
$el
);
}
$el
.
find
(
'
.js-finish-edit-warning
'
).
show
();
...
...
@@ -1188,7 +1189,7 @@ export default class Notes {
}
static
checkMergeRequestStatus
()
{
if
(
g
l
.
utils
.
g
etPagePath
(
1
)
===
'
merge_requests
'
)
{
if
(
getPagePath
(
1
)
===
'
merge_requests
'
)
{
gl
.
mrWidget
.
checkStatus
();
}
}
...
...
@@ -1326,7 +1327,7 @@ export default class Notes {
* 2) Identify comment type; a) Main thread b) Discussion thread c) Discussion resolve
* 3) Build temporary placeholder element (using `createPlaceholderNote`)
* 4) Show placeholder note on UI
* 5) Perform network request to submit the note using `
gl.utils.
ajaxPost`
* 5) Perform network request to submit the note using `ajaxPost`
* a) If request is successfully completed
* 1. Remove placeholder element
* 2. Show submitted Note element
...
...
@@ -1408,7 +1409,7 @@ export default class Notes {
/* eslint-disable promise/catch-or-return */
// Make request to submit comment on server
gl
.
utils
.
ajaxPost
(
formAction
,
formData
)
ajaxPost
(
formAction
,
formData
)
.
then
((
note
)
=>
{
// Submission successful! remove placeholder
$notesContainer
.
find
(
`#
${
noteUniqueId
}
`
).
remove
();
...
...
@@ -1510,7 +1511,7 @@ export default class Notes {
/* eslint-disable promise/catch-or-return */
// Make request to update comment on server
gl
.
utils
.
ajaxPost
(
formAction
,
formData
)
ajaxPost
(
formAction
,
formData
)
.
then
((
note
)
=>
{
// Submission successful! render final note element
this
.
updateNote
(
note
,
$editingNote
);
...
...
app/assets/javascripts/notes/stores/actions.js
View file @
6a1b84c7
...
...
@@ -7,6 +7,7 @@ import * as constants from '../constants';
import
service
from
'
../services/issue_notes_service
'
;
import
loadAwardsHandler
from
'
../../awards_handler
'
;
import
sidebarTimeTrackingEventHub
from
'
../../sidebar/event_hub
'
;
import
{
isInViewport
,
scrollToElement
}
from
'
../../lib/utils/common_utils
'
;
let
eTagPoll
;
...
...
@@ -211,7 +212,7 @@ export const toggleAwardRequest = ({ commit, getters, dispatch }, data) => {
};
export
const
scrollToNoteIfNeeded
=
(
context
,
el
)
=>
{
if
(
!
gl
.
utils
.
isInViewport
(
el
[
0
]))
{
gl
.
utils
.
scrollToElement
(
el
);
if
(
!
isInViewport
(
el
[
0
]))
{
scrollToElement
(
el
);
}
};
app/assets/javascripts/profile/profile.js
View file @
6a1b84c7
/* eslint-disable comma-dangle, no-unused-vars, class-methods-use-this, quotes, consistent-return, func-names, prefer-arrow-callback, space-before-function-paren, max-len */
/* global Flash */
import
{
getPagePath
}
from
'
../lib/utils/common_utils
'
;
((
global
)
=>
{
class
Profile
{
...
...
@@ -93,7 +94,7 @@
return
$title
.
val
(
comment
[
1
]).
change
();
}
});
if
(
g
lobal
.
utils
.
g
etPagePath
()
===
'
profiles
'
)
{
if
(
getPagePath
()
===
'
profiles
'
)
{
return
new
Profile
();
}
});
...
...
app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
View file @
6a1b84c7
import
PANEL_STATE
from
'
./constants
'
;
import
{
backOff
}
from
'
../lib/utils/common_utils
'
;
export
default
class
PrometheusMetrics
{
constructor
(
wrapperSelector
)
{
...
...
@@ -79,7 +80,7 @@ export default class PrometheusMetrics {
loadActiveMetrics
()
{
this
.
showMonitoringMetricsPanelState
(
PANEL_STATE
.
LOADING
);
gl
.
utils
.
backOff
((
next
,
stop
)
=>
{
backOff
((
next
,
stop
)
=>
{
$
.
getJSON
(
this
.
activeMetricsEndpoint
)
.
done
((
res
)
=>
{
if
(
res
&&
res
.
success
)
{
...
...
app/assets/javascripts/search_autocomplete.js
View file @
6a1b84c7
/* eslint-disable comma-dangle, no-return-assign, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-unused-vars, no-cond-assign, consistent-return, object-shorthand, prefer-arrow-callback, func-names, space-before-function-paren, prefer-template, quotes, class-methods-use-this, no-unused-expressions, no-sequences, wrap-iife, no-lonely-if, no-else-return, no-param-reassign, vars-on-top, max-len */
import
{
isInGroupsPage
,
isInProjectPage
,
getGroupSlug
,
getProjectSlug
}
from
'
./lib/utils/common_utils
'
;
((
global
)
=>
{
const
KEYCODE
=
{
...
...
@@ -146,14 +147,14 @@
}
getCategoryContents
()
{
var
dashboardOptions
,
groupOptions
,
issuesPath
,
items
,
mrPath
,
name
,
options
,
projectOptions
,
userId
,
userName
,
utils
;
var
dashboardOptions
,
groupOptions
,
issuesPath
,
items
,
mrPath
,
name
,
options
,
projectOptions
,
userId
,
userName
;
userId
=
gon
.
current_user_id
;
userName
=
gon
.
current_username
;
utils
=
gl
.
utils
,
projectOptions
=
gl
.
projectOptions
,
groupOptions
=
gl
.
groupOptions
,
dashboardOptions
=
gl
.
dashboardOptions
;
if
(
utils
.
isInGroupsPage
()
&&
groupOptions
)
{
options
=
groupOptions
[
utils
.
getGroupSlug
()];
}
else
if
(
utils
.
isInProjectPage
()
&&
projectOptions
)
{
options
=
projectOptions
[
utils
.
getProjectSlug
()];
projectOptions
=
gl
.
projectOptions
,
groupOptions
=
gl
.
groupOptions
,
dashboardOptions
=
gl
.
dashboardOptions
;
if
(
isInGroupsPage
()
&&
groupOptions
)
{
options
=
groupOptions
[
getGroupSlug
()];
}
else
if
(
isInProjectPage
()
&&
projectOptions
)
{
options
=
projectOptions
[
getProjectSlug
()];
}
else
if
(
dashboardOptions
)
{
options
=
dashboardOptions
;
}
...
...
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
View file @
6a1b84c7
import
statusCodes
from
'
../../lib/utils/http_status
'
;
import
{
bytesToMiB
}
from
'
../../lib/utils/number_utils
'
;
import
{
backOff
}
from
'
../../lib/utils/common_utils
'
;
import
MemoryGraph
from
'
../../vue_shared/components/memory_graph
'
;
import
MRWidgetService
from
'
../services/mr_widget_service
'
;
...
...
@@ -84,7 +84,7 @@ export default {
}
},
loadMetrics
()
{
gl
.
utils
.
backOff
((
next
,
stop
)
=>
{
backOff
((
next
,
stop
)
=>
{
MRWidgetService
.
fetchMetrics
(
this
.
metricsUrl
)
.
then
((
res
)
=>
{
if
(
res
.
status
===
statusCodes
.
NO_CONTENT
)
{
...
...
spec/javascripts/lib/utils/common_utils_spec.js
View file @
6a1b84c7
This diff is collapsed.
Click to expand it.
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