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
d7a5d5b6
Commit
d7a5d5b6
authored
Aug 29, 2018
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed the testing console.log's
parent
53def4e2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
13 deletions
+0
-13
app/assets/javascripts/diffs/components/app.vue
app/assets/javascripts/diffs/components/app.vue
+0
-1
app/assets/javascripts/diffs/components/diff_line_note_form.vue
...sets/javascripts/diffs/components/diff_line_note_form.vue
+0
-3
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
.../javascripts/diffs/components/parallel_diff_table_row.vue
+0
-1
app/assets/javascripts/diffs/store/actions.js
app/assets/javascripts/diffs/store/actions.js
+0
-8
No files found.
app/assets/javascripts/diffs/components/app.vue
View file @
d7a5d5b6
...
@@ -128,7 +128,6 @@ export default {
...
@@ -128,7 +128,6 @@ export default {
()
=>
{
()
=>
{
this
.
startRenderDiffsQueue
()
this
.
startRenderDiffsQueue
()
.
then
(()
=>
{
.
then
(()
=>
{
console
.
log
(
'
Done rendering Que
'
);
requestIdleCallback
(
requestIdleCallback
(
()
=>
{
()
=>
{
this
.
assignDiscussionsToDiff
(
this
.
discussionsStructuredByLineCode
);
this
.
assignDiscussionsToDiff
(
this
.
discussionsStructuredByLineCode
);
...
...
app/assets/javascripts/diffs/components/diff_line_note_form.vue
View file @
d7a5d5b6
...
@@ -90,10 +90,7 @@ export default {
...
@@ -90,10 +90,7 @@ export default {
this
.
refetchDiscussionById
({
path
:
endpoint
,
discussionId
:
result
.
discussion_id
})
this
.
refetchDiscussionById
({
path
:
endpoint
,
discussionId
:
result
.
discussion_id
})
.
then
(
selectedDiscussion
=>
{
.
then
(
selectedDiscussion
=>
{
//debugger;
console
.
log
(
'
SEL DISCUSSION:
'
,
selectedDiscussion
);
const
lineCodeDiscussions
=
utils
.
reduceDiscussionsToLineCodes
([
selectedDiscussion
]);
const
lineCodeDiscussions
=
utils
.
reduceDiscussionsToLineCodes
([
selectedDiscussion
]);
console
.
log
(
'
LINE CODE DISCUSSIONS:
'
,
lineCodeDiscussions
);
this
.
assignDiscussionsToDiff
(
lineCodeDiscussions
);
this
.
assignDiscussionsToDiff
(
lineCodeDiscussions
);
this
.
handleCancelCommentForm
();
this
.
handleCancelCommentForm
();
...
...
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
View file @
d7a5d5b6
...
@@ -61,7 +61,6 @@ export default {
...
@@ -61,7 +61,6 @@ export default {
},
},
},
},
created
()
{
created
()
{
// console.log('LINE : ', this.line);
this
.
newLineType
=
NEW_LINE_TYPE
;
this
.
newLineType
=
NEW_LINE_TYPE
;
this
.
oldLineType
=
OLD_LINE_TYPE
;
this
.
oldLineType
=
OLD_LINE_TYPE
;
this
.
parallelDiffViewType
=
PARALLEL_DIFF_VIEW_TYPE
;
this
.
parallelDiffViewType
=
PARALLEL_DIFF_VIEW_TYPE
;
...
...
app/assets/javascripts/diffs/store/actions.js
View file @
d7a5d5b6
...
@@ -30,16 +30,10 @@ export const fetchDiffFiles = ({ state, commit }) => {
...
@@ -30,16 +30,10 @@ export const fetchDiffFiles = ({ state, commit }) => {
};
};
export
const
assignDiscussionsToDiff
=
({
state
},
allLineDiscussions
)
=>
{
export
const
assignDiscussionsToDiff
=
({
state
},
allLineDiscussions
)
=>
{
console
.
log
(
'
ASSIGN DISCS :
'
);
console
.
log
(
'
DIFF :
'
,
state
.
diffFiles
);
console
.
log
(
'
STATE :
'
,
allLineDiscussions
);
Object
.
values
(
allLineDiscussions
).
forEach
(
discussions
=>
{
Object
.
values
(
allLineDiscussions
).
forEach
(
discussions
=>
{
if
(
discussions
.
length
>
0
)
{
if
(
discussions
.
length
>
0
)
{
console
.
log
(
'
KE :
'
,
discussions
);
const
fileHash
=
discussions
[
0
].
fileHash
;
const
fileHash
=
discussions
[
0
].
fileHash
;
const
selectedFile
=
state
.
diffFiles
.
find
(
file
=>
file
.
fileHash
===
fileHash
);
const
selectedFile
=
state
.
diffFiles
.
find
(
file
=>
file
.
fileHash
===
fileHash
);
console
.
log
(
'
FILE :
'
,
selectedFile
);
if
(
selectedFile
)
{
if
(
selectedFile
)
{
const
targetLine
=
selectedFile
.
parallelDiffLines
.
find
(
line
=>
{
const
targetLine
=
selectedFile
.
parallelDiffLines
.
find
(
line
=>
{
return
(
return
(
...
@@ -49,7 +43,6 @@ export const assignDiscussionsToDiff = ({ state }, allLineDiscussions) => {
...
@@ -49,7 +43,6 @@ export const assignDiscussionsToDiff = ({ state }, allLineDiscussions) => {
});
});
if
(
targetLine
)
{
if
(
targetLine
)
{
console
.
log
(
'
TARGET LINE :
'
,
targetLine
);
Object
.
assign
(
targetLine
.
right
,
{
discussions
});
Object
.
assign
(
targetLine
.
right
,
{
discussions
});
}
}
}
}
...
@@ -77,7 +70,6 @@ export const startRenderDiffsQueue = ({ state, commit }) => {
...
@@ -77,7 +70,6 @@ export const startRenderDiffsQueue = ({ state, commit }) => {
{
timeout
:
1000
},
{
timeout
:
1000
},
);
);
}
else
{
}
else
{
console
.
log
(
'
No more items found -> Done
'
);
resolve
();
resolve
();
}
}
});
});
...
...
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