BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a8140d5c
Commit
a8140d5c
authored
Mar 02, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix up `watch` alias lookup in Firefox
It was pulling
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/watch
parent
e6fc0207
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
awards_handler.js
app/assets/javascripts/awards_handler.js
+1
-1
gl_emoji.js
app/assets/javascripts/behaviors/gl_emoji.js
+2
-1
No files found.
app/assets/javascripts/awards_handler.js
View file @
a8140d5c
...
...
@@ -444,7 +444,7 @@ AwardsHandler.prototype.scrollToAwards = function scrollToAwards() {
};
AwardsHandler
.
prototype
.
normalizeEmojiName
=
function
normalizeEmojiName
(
emoji
)
{
return
this
.
aliases
[
emoji
]
||
emoji
;
return
Object
.
prototype
.
hasOwnProperty
.
call
(
this
.
aliases
,
emoji
)
?
this
.
aliases
[
emoji
]
:
emoji
;
};
AwardsHandler
...
...
app/assets/javascripts/behaviors/gl_emoji.js
View file @
a8140d5c
...
...
@@ -16,7 +16,8 @@ const glEmojiTagDefaults = {
};
function
glEmojiTag
(
inputName
,
options
)
{
const
opts
=
Object
.
assign
({},
glEmojiTagDefaults
,
options
);
const
name
=
emojiAliases
[
inputName
]
||
inputName
;
const
name
=
Object
.
prototype
.
hasOwnProperty
.
call
(
emojiAliases
,
inputName
)
?
emojiAliases
[
inputName
]
:
inputName
;
const
emojiInfo
=
emojiMap
[
name
];
const
fallbackImageSrc
=
`
${
gon
.
relative_url_root
||
''
}
/assets/emoji/
${
name
}
-
${
emojiInfo
.
digest
}
.png`
;
const
fallbackSpriteClass
=
`emoji-
${
name
}
`
;
...
...
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