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
8bdd88a4
Commit
8bdd88a4
authored
Aug 01, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Checks if DiffNotesApp is defined
parent
ee62a2fd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+1
-1
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+3
-3
app/assets/javascripts/single_file_diff.js
app/assets/javascripts/single_file_diff.js
+3
-3
No files found.
app/assets/javascripts/merge_request_tabs.js
View file @
8bdd88a4
...
@@ -120,7 +120,7 @@
...
@@ -120,7 +120,7 @@
return
function
(
data
)
{
return
function
(
data
)
{
$
(
'
#diffs
'
).
html
(
data
.
html
);
$
(
'
#diffs
'
).
html
(
data
.
html
);
if
(
DiffNotesApp
)
{
if
(
typeof
DiffNotesApp
!==
'
undefined
'
)
{
DiffNotesApp
.
compileComponents
();
DiffNotesApp
.
compileComponents
();
}
}
...
...
app/assets/javascripts/notes.js
View file @
8bdd88a4
...
@@ -300,7 +300,7 @@
...
@@ -300,7 +300,7 @@
discussionContainer
.
append
(
note_html
);
discussionContainer
.
append
(
note_html
);
}
}
if
(
DiffNotesApp
)
{
if
(
typeof
DiffNotesApp
!==
'
undefined
'
)
{
DiffNotesApp
.
compileComponents
();
DiffNotesApp
.
compileComponents
();
}
}
...
@@ -429,7 +429,7 @@
...
@@ -429,7 +429,7 @@
$note_li
.
replaceWith
(
$html
);
$note_li
.
replaceWith
(
$html
);
if
(
DiffNotesApp
)
{
if
(
typeof
DiffNotesApp
!==
'
undefined
'
)
{
DiffNotesApp
.
compileComponents
();
DiffNotesApp
.
compileComponents
();
}
}
};
};
...
@@ -593,7 +593,7 @@
...
@@ -593,7 +593,7 @@
if
(
canResolve
===
'
false
'
||
!
form
.
closest
(
'
.notes_content
'
).
find
(
'
.note:not(.system-note)
'
).
length
)
{
if
(
canResolve
===
'
false
'
||
!
form
.
closest
(
'
.notes_content
'
).
find
(
'
.note:not(.system-note)
'
).
length
)
{
form
.
find
(
'
comment-and-resolve-btn
'
).
remove
();
form
.
find
(
'
comment-and-resolve-btn
'
).
remove
();
}
else
if
(
DiffNotesApp
)
{
}
else
if
(
typeof
DiffNotesApp
!==
'
undefined
'
)
{
var
$commentBtn
=
form
.
find
(
'
comment-and-resolve-btn
'
);
var
$commentBtn
=
form
.
find
(
'
comment-and-resolve-btn
'
);
$commentBtn
$commentBtn
.
attr
(
'
:discussion-id
'
,
"
'
"
+
dataHolder
.
data
(
'
discussionId
'
)
+
"
'
"
);
.
attr
(
'
:discussion-id
'
,
"
'
"
+
dataHolder
.
data
(
'
discussionId
'
)
+
"
'
"
);
...
...
app/assets/javascripts/single_file_diff.js
View file @
8bdd88a4
...
@@ -36,13 +36,13 @@
...
@@ -36,13 +36,13 @@
if
(
!
this
.
isOpen
&&
!
this
.
hasError
)
{
if
(
!
this
.
isOpen
&&
!
this
.
hasError
)
{
this
.
content
.
hide
();
this
.
content
.
hide
();
this
.
collapsedContent
.
show
();
this
.
collapsedContent
.
show
();
if
(
DiffNotesApp
)
{
if
(
typeof
DiffNotesApp
!==
'
undefined
'
)
{
DiffNotesApp
.
compileComponents
();
DiffNotesApp
.
compileComponents
();
}
}
}
else
if
(
this
.
content
)
{
}
else
if
(
this
.
content
)
{
this
.
collapsedContent
.
hide
();
this
.
collapsedContent
.
hide
();
this
.
content
.
show
();
this
.
content
.
show
();
if
(
DiffNotesApp
)
{
if
(
typeof
DiffNotesApp
!==
'
undefined
'
)
{
DiffNotesApp
.
compileComponents
();
DiffNotesApp
.
compileComponents
();
}
}
}
else
{
}
else
{
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
if
(
data
.
html
)
{
if
(
data
.
html
)
{
_this
.
content
=
$
(
data
.
html
);
_this
.
content
=
$
(
data
.
html
);
_this
.
content
.
syntaxHighlight
();
_this
.
content
.
syntaxHighlight
();
if
(
DiffNotesApp
)
{
if
(
typeof
DiffNotesApp
!==
'
undefined
'
)
{
DiffNotesApp
.
compileComponents
();
DiffNotesApp
.
compileComponents
();
}
}
}
else
{
}
else
{
...
...
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